导出回显零件号

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java

@@ -230,8 +230,8 @@ public class PlanAssignSteerController extends BladeController {
 			if(StringUtils.isEmpty(excel.getOemName()) && excel.getOemId() != null){
 				excel.setOemName(excel.getOemId().toString());
 			}
-			if(StringUtils.isEmpty(excel.getDsPartName()) && excel.getDsPart() != null){
-				excel.setDsPartName(excel.getDsPart().toString());
+			if(StringUtils.isEmpty(excel.getDsPartCode()) && excel.getDsPart() != null){
+				excel.setDsPartCode(excel.getDsPart().toString());
 			}
 			if(StringUtils.isEmpty(excel.getPlatingName()) && excel.getPlatingId() != null){
 				excel.setPlatingName(excel.getPlatingId().toString());

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java

@@ -49,7 +49,7 @@ public class PlanAssignSteerExcel implements Serializable {
      */
     @ColumnWidth(20)
     @ExcelProperty("零件")
-    private String dsPartName;
+    private String dsPartCode;
     /**
      * 分派比例(%)
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml

@@ -26,7 +26,7 @@
         (
             SELECT a.*,
                    b.oc_name as oem_name,
-                   c.part_name as ds_part_name,
+                   c.part_code as ds_part_code,
                    d.ca_name as plating_name
             FROM BS_PLAN_ASSIGN_STEER a
             LEFT JOIN BS_OEM b on a.oem_id = b.id

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml

@@ -222,7 +222,7 @@
             AND wp.NEXT_WP_ID = #{q.nextProcessId}
         </if>
         <if test="q.woCode != null">
-            AND wo.WO_ID = #{q.woCode}
+            AND wo.WO_CODE = #{q.woCode}
         </if>
         <if test="q.partCode != null and q.partCode != ''">
             AND wo.PART_CODE = #{q.partCode}