导出回显零件号

liweidong
maxiangong 3 days ago
parent cfccb198f0
commit a96fc8e5df
  1. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java
  2. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java
  3. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml
  4. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml

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

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

@ -26,7 +26,7 @@
( (
SELECT a.*, SELECT a.*,
b.oc_name as oem_name, 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 d.ca_name as plating_name
FROM BS_PLAN_ASSIGN_STEER a FROM BS_PLAN_ASSIGN_STEER a
LEFT JOIN BS_OEM b on a.oem_id = b.id LEFT JOIN BS_OEM b on a.oem_id = b.id

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

Loading…
Cancel
Save