加工记录时间加毫秒，客退品和电子化检验查询串的问题修改

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -953,7 +953,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         move.setLgort(srcLocate);
         move.setUmlgo(destLocate);
         move.setPartInspectionId(partInspectionId);
-        move.setMenge(1d);
+        move.setMenge(Double.valueOf(requestModel.getReworkedQty()+""));
         move.setMeins(mesPartSap.getUnit());
         move.setPostDate(TimeTool.getToday());
         move.setPostTime(TimeTool.getTimeShortWithColon());

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java

@@ -486,9 +486,15 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
      */
     private MesPartInspection getPartInspection(MesPartInspectionInputModel inputModel, String org) {
 
+        Integer refundFlag = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+        if (inputModel.getOptType() == 2) {
+            refundFlag = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+        }
+
         //根据条码找最近一条单据
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getStringEqualPack(inputModel.getSn(), "sn", packBean);
+        DdlPreparedPack.getNumEqualPack(refundFlag, "refundFlag", packBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
         MesPartInspection partInspection = partInspectionRepository.getByProperty(packBean);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionRecordGenerateStepService.java

@@ -24,10 +24,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -152,6 +150,7 @@ public class MesProductionRecordGenerateStepService extends BaseStepService {
         productionRecord.setOrganizeCode(reqBean.getOrganizeCode());
         ConvertBean.serviceModelInitialize(productionRecord, reqBean.getUserInfo());
         productionRecord.setCompleteDateTime(productionRecord.getModifyDatetime());
+        productionRecord.setCreateDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
 
         productionRecord.setFid(UUID.randomUUID().toString());
         productionRecord.setOneMouldMoreId(UUID.randomUUID().toString());