工号及图号不存id

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/SlaveDao.java

@@ -17,8 +17,8 @@ public interface SlaveDao {
 
     @Select("select REPLACE(UUID(), '-', '') as ID,'0' as DELETED,t.ID as PARTNOID,t.DTDRAWINGNO,t.DTPARTNAME,t.DTSERIALID,l.DLPROJID,l.DLPROJNAME from t_design_task t\n" +
             "left join t_drawing_list l on l.DLSERIALID=t.DTSERIALID\n" +
-            "where t.DELETED='0' and IFNULL(t.DTDRAWINGNO,'')!='' and IFNULL(t.DTPARTNAME,'')!='' and t.DTSERIALID=#{dtserialId} ${searStr} order by t.DTDRAWINGNO")
-    List<QcsPartNoDo> getPartnos(@Param("dtserialId") String dtserialId, @Param("searStr") String searStr);
+            "where t.DELETED='0' and IFNULL(t.DTDRAWINGNO,'')!='' and IFNULL(t.DTPARTNAME,'')!='' and l.DLPROJID=#{procode} ${searStr} order by t.DTDRAWINGNO")
+    List<QcsPartNoDo> getPartnos(@Param("procode") String procode, @Param("searStr") String searStr);
 
     @Select("select t.ID as PARTNOID,t.DTDRAWINGNO,t.DTPARTNAME,t.DTSERIALID,l.DLPROJID,l.DLPROJNAME from t_design_task t\n" +
             "left join t_drawing_list l on l.DLSERIALID=t.DTSERIALID\n" +

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/CommonService.java

@@ -13,5 +13,5 @@ public interface CommonService {
 
     R getMdfFormInfo(String dtwhoapproveTime) throws Exception;
 
-    IPage<Map<String, Object>> getPartno(String dtserialId, String dtdrawingno, String dtpartname) throws Exception;
+    IPage<Map<String, Object>> getPartno(String procode, String dtdrawingno, String dtpartname) throws Exception;
 }

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/CommonServiceImpl.java

@@ -151,7 +151,7 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public IPage<Map<String, Object>> getPartno(String dtserialId, String dtdrawingno, String dtpartname) throws Exception {
+    public IPage<Map<String, Object>> getPartno(String procode, String dtdrawingno, String dtpartname) throws Exception {
         String searStr = "";
         if (StringUtils.isNotBlank(dtdrawingno)) {
             searStr = " and t.DTDRAWINGNO like '%" + dtdrawingno + "%'";
@@ -160,7 +160,7 @@ public class CommonServiceImpl implements CommonService {
             searStr += " and t.DTPARTNAME like '" + dtpartname + "'";
         }
 //        log.info("获取获取部件图号开始");
-        List<QcsPartNoDo> qcsPartNoDos = slaveDao.getPartnos(dtserialId, searStr);
+        List<QcsPartNoDo> qcsPartNoDos = slaveDao.getPartnos(procode, searStr);
         Page ipe = new Page();
         ipe.setRecords(StringUtil.convertToUpperFieldMap(qcsPartNoDos));
 //        log.info("获取部件图号返回");

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMainCostServiceImpl.java

@@ -709,7 +709,6 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                     } else {
                         qcsLossDetailDo.setId(SecurityUtil.getUUID());
                         qcsLossDetailDo.setMainid(costId);
-                        qcsLossDetailDo.setProid(codeParts.get(0).getDtserialid());
                         qcsLossDetailDo.setProcode(procode);
                         qcsLossDetailDo.setProname(codeParts.get(0).getDlprojname());
                     }
@@ -727,7 +726,6 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                     if (partNos.size() == 0) {
                         stringBuilder.append("部件图号" + partno + "与项目工号" + procode + "不匹配，");
                     } else {
-                        qcsLossDetailDo.setPartnoid(partNos.get(0).getPartnoid());
                         qcsLossDetailDo.setPartno(partno);
                         qcsLossDetailDo.setPartname(partNos.get(0).getDtpartname());
                     }
@@ -759,10 +757,10 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                 String finalLossno = lossno;
                 List<Map<String, String>> proTypeNos = hasProTypeLossNos.stream()
                         .filter(map -> {
-                            Object proid = map.get("PROID");
+                            Object pcode = map.get("PROCODE");
                             Object loType = map.get("LOSSTYPE");
                             Object loNo = map.get("LOSSNO");
-                            return proid.equals(qcsLossDetailDo.getProid()) && loType.equals(losstype) && loNo.equals(finalLossno);
+                            return pcode.equals(qcsLossDetailDo.getProcode()) && loType.equals(losstype) && loNo.equals(finalLossno);
                         }).collect(Collectors.toList());
                 if (proTypeNos.size() > 0) {
                     stringBuilder.append("项目工号" + procode + "、类别" + losstype + "、编号" + lossno + "重复，");
@@ -802,7 +800,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                     //内部的设计变更损失
                     if (costType.equals("3") && thrSubIndex == disSubIndex) {
                         String finalYearMonth = yearMonth;
-                        QcsMdfFormDo mdfFormDo = qcsMdfFormDos.stream().filter(m -> m.getProjectid().equals(qcsLossDetailDo.getProid()) && m.getSourcenumbercode().equals(qcsLossDetailDo.getLossno()) && m.getBasename().equals(finalYearMonth)).findAny().orElse(null);
+                        QcsMdfFormDo mdfFormDo = qcsMdfFormDos.stream().filter(m -> m.getProjectdlprojid().equals(qcsLossDetailDo.getProcode()) && m.getSourcenumbercode().equals(qcsLossDetailDo.getLossno()) && m.getBasename().equals(finalYearMonth)).findAny().orElse(null);
                         if (mdfFormDo != null) {
                             amount = mdfFormDo.getActamount();
                             qcsLossDetailDo.setRoption("{\"dataSource\":\"导入\",\"dataType\":\"修改单同步\"}");
@@ -832,9 +830,9 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
                 if (StringUtils.isNotBlank(stringBuilder.toString())) {
                     allStrBuilder.append("第").append(i + 1).append("行").append(stringBuilder.deleteCharAt(stringBuilder.length() - 1)).append("<br>");
                 } else {
-                    if (StringUtils.isNotEmpty(qcsLossDetailDo.getProid()) && StringUtils.isNotEmpty(qcsLossDetailDo.getLosstype()) && StringUtils.isNotEmpty(qcsLossDetailDo.getLossno())) {
+                    if (StringUtils.isNotEmpty(qcsLossDetailDo.getProcode()) && StringUtils.isNotEmpty(qcsLossDetailDo.getLosstype()) && StringUtils.isNotEmpty(qcsLossDetailDo.getLossno())) {
                         Map<String, String> proTypeLossNo = new HashMap<>();
-                        proTypeLossNo.put("PROID", qcsLossDetailDo.getProid());
+                        proTypeLossNo.put("PROCODE", qcsLossDetailDo.getProcode());
                         proTypeLossNo.put("LOSSTYPE", qcsLossDetailDo.getLosstype());
                         proTypeLossNo.put("LOSSNO", qcsLossDetailDo.getLossno());
                         hasProTypeLossNos.add(proTypeLossNo);
@@ -860,13 +858,12 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
             //同步修改单提交的数据
             for (QcsMdfFormDo qcsMdfFormDo : qcsMdfFormDos) {
                 String finalYearMonth1 = yearMonth;
-                QcsLossDetailDo hasDetailDo = qcsLossDetailDoList.stream().filter(ld -> ld.getProid().equals(qcsMdfFormDo.getProjectid()) && ld.getLossno() != null && ld.getLossno().equals(qcsMdfFormDo.getSourcenumbercode()) && qcsMdfFormDo.getBasename().equals(finalYearMonth1)).findAny().orElse(null);
+                QcsLossDetailDo hasDetailDo = qcsLossDetailDoList.stream().filter(ld -> ld.getProcode().equals(qcsMdfFormDo.getProjectdlprojid()) && ld.getLossno() != null && ld.getLossno().equals(qcsMdfFormDo.getSourcenumbercode()) && qcsMdfFormDo.getBasename().equals(finalYearMonth1)).findAny().orElse(null);
                 if (hasDetailDo == null && disSubIndex != 0) {
                     QcsLossDetailDo lossDetailDo = new QcsLossDetailDo();
                     lossDetailDo.setRoption("{\"dataSource\":\"导入\",\"dataType\":\"修改单同步\"}");
                     lossDetailDo.setId(SecurityUtil.getUUID());
                     lossDetailDo.setMainid(costId);
-                    lossDetailDo.setProid(qcsMdfFormDo.getProjectid());
                     lossDetailDo.setProcode(qcsMdfFormDo.getProjectdlprojid());
                     lossDetailDo.setProname(qcsMdfFormDo.getProjectdlprojname());
                     lossDetailDo.setLosstype("修改单");

qcs-server/src/main/java/com/rongwei/controller/CommonController.java

@@ -28,9 +28,9 @@ public class CommonController {
 
     //获取部件图号
     @RequestMapping("/getPartno")
-    public R getPartno(String dtserialId, String dtdrawingno, String dtpartname) {
+    public R getPartno(String procode, String dtdrawingno, String dtpartname) {
         try {
-            IPage<Map<String, Object>> result = commonService.getPartno(dtserialId, dtdrawingno, dtpartname);
+            IPage<Map<String, Object>> result = commonService.getPartno(procode, dtdrawingno, dtpartname);
             return R.ok(result);
         } catch (Exception e) {
             e.printStackTrace();