Browse Source

feature 工艺路线对应的工艺步骤保存实际的输入和输出规则

xiahan 1 year ago
parent
commit
902c2f6fb0

+ 0 - 6
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsCraftStepServiceImpl.java

@@ -72,12 +72,6 @@ public class ApsCraftStepServiceImpl extends ServiceImpl<ApsCraftStepDao, ApsCra
             updateApsRouteAboutVos.forEach(data->{
                 ApsCraftRouteStepDo apsCraftRouteStepDo=  new ApsCraftRouteStepDo();
                 BeanUtils.copyProperties(data,apsCraftRouteStepDo);
-                apsCraftRouteStepDo.setThickstr(data.getActualoutputthickstr());
-                apsCraftRouteStepDo.setThickend(data.getActualoutputthickend());
-                apsCraftRouteStepDo.setWidthstr(data.getActualoutputwidthstr());
-                apsCraftRouteStepDo.setWidthend(data.getActualoutputwidthend());
-                apsCraftRouteStepDo.setLengthstr(data.getActualoutputlengthstr());
-                apsCraftRouteStepDo.setLengthend(data.getActualoutputlengthend());
                 updateList.add(apsCraftRouteStepDo);
             });
             apsCraftRouteStepService.saveOrUpdateBatch(updateList);

+ 4 - 3
cx-aps/cx-aps-common/src/main/resources/mybatis/ApsCraftRouteOutMaterRequestDao.xml

@@ -99,9 +99,10 @@
             ACTUALWIDTHEND,ACTUALLENGTHSTR,ACTUALLENGTHEND,ACTUALOUTMATERREQUEST)
             SELECT TENANTID, UUID(), ROPTION, DELETED, REMARK, NOW(), CREATEUSERID, NOW(), MODIFYUSERID, CREATEUSERNAME,
             MODIFYUSERNAME, DATANO, #{routeId}, #{data.id} , MATERIALCODE,
-            MATERIALNAME, THICKRULE, THICKCHANGE, THICKOFFSET, THICKSTR, THICKEND, THICKREMARK, WIDTHRULE, WIDTHCHANGE,
-            WIDTHOFFSET,
-            WIDTHSTR, WIDTHEND, WIDTHREMARK, LENGTHRULE, LENGTHCHANGE, LENGTHOFFSET, LENGTHSTR, LENGTHEND, LENGTHREMARK,
+            MATERIALNAME,
+            THICKRULE, THICKCHANGE, THICKOFFSET, #{data.actualoutputthickstr}, #{data.actualoutputthickend},  THICKREMARK,
+            WIDTHRULE, WIDTHCHANGE, WIDTHOFFSET,#{data.actualoutputwidthstr}, #{data.actualoutputwidthend}, WIDTHREMARK,
+            LENGTHRULE, LENGTHCHANGE, LENGTHOFFSET,  #{data.actualoutputlengthstr}, #{data.actualoutputlengthend}, LENGTHREMARK,
             OUTVAL,
             OUTMATERREQUEST, PRODUCTTYPERULEID, PRODUCTTYPERULE, #{data.outputproducttypeid}, #{data.outputproducttype}, METALRULE, #{data.outputmetal},
             METALSTATERULE,