Browse Source

订单产出标签报表增加属性变动按钮

master
赵宏斌 8 months ago
parent
commit
3eb3f79334
  1. 17
      src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
  2. 14
      src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java
  3. 2
      src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java
  4. 10
      src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java
  5. 2
      src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java
  6. 15
      src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

17
src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java

@ -55,6 +55,23 @@ public class SFDCRollsOutData {
private String parentRollNo;
private String parentRollType;
private String finalStatus;
private String batchNo;
public Date getCreatedDate3() {
return createdDate3;
}
public void setCreatedDate3(Date createdDate3) {
this.createdDate3 = createdDate3;
}
public String getBatchNo() {
return batchNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public Date getCreatedDate2() {
return createdDate2;
}

14
src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java

@ -183,6 +183,20 @@ public class ProductionReportController {
return map;
}
/**
* 订单产出标签报表--保存属性变更
* @param
* @return
*/
@PostMapping(value="/updateSfdcRollsAttribute")
@ResponseBody
public Object updateSfdcRollsAttribute(@RequestBody List<SFDCRollsOutData> indata){
Map<String, Object> map = new HashMap<>();
productionReportService.updateSfdcRollsAttribute(indata);
map.put("code", 0);
return map;
}
//=============查询-CQC检验记录===================
/**
* 查询-CQC检验记录

2
src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java

@ -143,4 +143,6 @@ public interface ProductionReportMapper {
List<SearchReportInOrderNoData> searchReportInOrderNoData(SearchReportInOrderNoData indata);
List<SFDCRollsOutData> searchSfdcRollsReport(SFDCRollsOutData indata);
void updateSfdcRollsAttribute(SFDCRollsOutData data);
}

10
src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java

@ -177,4 +177,14 @@ public class ProductionReportServiceImpl implements ProductionReportService {
List<SFDCRollsOutData> result = productionReportMapper.searchSfdcRollsReport(indata);
return result;
}
@Override
public void updateSfdcRollsAttribute(List<SFDCRollsOutData> indata) {
for (SFDCRollsOutData data : indata) {
data.setParentRollNo(data.getParentRollNo().trim());
data.setBatchNo(data.getBatchNo().trim());
data.setRemark(data.getRemark().trim());
productionReportMapper.updateSfdcRollsAttribute(data);
}
}
}

2
src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java

@ -113,4 +113,6 @@ public interface ProductionReportService {
ResponseData cancelReport(SearchProductionLineOutputReportData inData);
List<SFDCRollsOutData> searchSfdcRollsReport(SFDCRollsOutData indata);
void updateSfdcRollsAttribute(List<SFDCRollsOutData> indata);
}

15
src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

@ -31,6 +31,21 @@
<update id="updateOperatorResource">
UPDATE WorkCenterResource set CalendarID=#{calendarID}, Efficiency=#{efficiency} where ResourceID=#{operatorID} and Site=#{site}
</update>
<update id="updateSfdcRollsAttribute">
update SFDC_Rolls set
site = #{Site},
<if test="parentRollNo != null and parentRollNo != ''">
parent_roll_no = #{parentRollNo},
</if>
<if test="batchNo != null and batchNo != ''">
batch_no = #{batchNo},
</if>
<if test="Remark != null and Remark != ''">
Remark = #{Remark},
</if>
OrderNo = #{OrderNo}
where site = #{Site} and OrderNo = #{OrderNo} and RollNo = #{RollNo}
</update>
<delete id="deleteProductionLineOperatorRegistration" parameterType="com.gaotao.modules.shopOrder.entity.OperatorData">
delete from Operator where OperatorID=#{operatorID} and Site=#{site}

Loading…
Cancel
Save