45822 库位与责任关系增加责任关系

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesOrgService.java

@@ -14,4 +14,7 @@ import java.util.List;
 public interface IMesOrgService {
 
     List<MesOrg> queryMesOrg(MesOrg mesOrg);
+
+    List<MesOrg> queryMesOrgSplit(MesOrg mesOrg);
+
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesOrgController.java

@@ -39,4 +39,19 @@ public class MesOrgController {
             return ResultBean.fail(e);
         }
     }
+
+    @GetMapping(value = "/query-split")
+    @ApiOperation(value = "查询责任人区域关系（拆分责任人）")
+    public ResultBean queryMesOrgSplit(MesOrg mesOrg) {
+        try {
+            List<MesOrg> mesOrgList= mesOrgService.queryMesOrgSplit(mesOrg);
+            return ResultBean.success("查询成功")
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(mesOrgList);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e).build();
+        } catch (Exception e) {
+            return ResultBean.fail(e);
+        }
+    }
+
 }

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

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -39,4 +40,36 @@ public class MesOrgServiceImpl implements IMesOrgService {
 
         return mesOrgRDao.findByHqlWhere(packBean);
     }
+
+    @Override
+    public List<MesOrg> queryMesOrgSplit(MesOrg mesOrg) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesOrg.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesOrg.getInventoryLocationCode(), "inventoryLocationCode", packBean);
+        if(StringUtil.isEmpty(mesOrg.getResponsibleParty())){
+            DdlPreparedPack.getIsNotNull( "responsibleParty", packBean);
+        }else {
+            DdlPreparedPack.getStringEqualPack(mesOrg.getResponsibleParty(), "responsibleParty", packBean);
+        }
+        packBean.setOrderByStr(mesOrg.orderBy());
+        List<MesOrg> mesOrgList = mesOrgRDao.findByHqlWhere(packBean);
+        List<MesOrg> resultList = new ArrayList<>();
+        for (MesOrg org : mesOrgList) {
+            String responsibleParty = org.getResponsibleParty();
+            if (StringUtil.isEmpty(responsibleParty)) {
+                resultList.add(org);
+            }else {
+                if (responsibleParty.contains(",")) {
+                    String[] split = responsibleParty.split(",");
+                    for (int i = 0; i < split.length; i++) {
+                        org.setResponsibleParty(split[i]);
+                        resultList.add(org);
+                    }
+                }else {
+                    resultList.add(org);
+                }
+            }
+        }
+        return resultList;
+    }
+
 }

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

@@ -573,11 +573,11 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             }
 
             //更新检验单
-            DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
-            DdlPreparedPack.getStringEqualPack(areaCode, "inventoryLocationCode", packBean);
-            MesOrg mesOrg = mesOrgRDao.getByProperty(packBean);
+//            DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
+//            DdlPreparedPack.getStringEqualPack(areaCode, "inventoryLocationCode", packBean);
+//            MesOrg mesOrg = mesOrgRDao.getByProperty(packBean);
             //报废时设置责任人
-            model.getPartInspection().setResponsibleParty(StringUtil.isEmpty(mesOrg)?areaCode:mesOrg.getResponsibleParty());
+            model.getPartInspection().setResponsibleParty(model.getOnlyPerson());
             model.getPartInspection().setDefectTypeId(person.getId());
             model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());
             model.getPartInspection().setRejectQty(model.getPartInspection().getQty());