44905 MES-发运异常处理

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderPart;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
@@ -22,6 +23,20 @@ public interface IMesShippingOrderManagementDetailService extends IBaseMesServic
     @ApiOperation("查询发运单明细")
     ListPager<MesShippingOrderManagementDetailModel> queryMesShippingDetailsByPager(MesShippingOrderManagementDetailModel mesShippingOrderManagementDetailModel, Pager pager);
 
+    @ApiOperation("查询发运单明细")
+    ListPager<MesShippingOrderManagementDetailModel> queryMesShippingErrorDetailsByPager(MesShippingOrderManagementDetailModel mesShippingOrderManagementDetailModel, Pager pager);
+
+
+    @ApiOperation("根据客户零件匹配零件号")
+    public ResultBean supplyBycustPartNo(Long[] ids);
+
+
+    @ApiOperation("根据CBR匹配零件号")
+    public ResultBean supplyByCBR(Long[] ids);
+
+    @ApiOperation("手动发运改数量")
+    public ResultBean updateQty(Long[] ids, double qty);
+
     @ApiOperation("发运退回")
     void doShippingBack(Long[] idList,String organizeCode,String userName);
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementDetailController.java

@@ -55,6 +55,55 @@ public class MesShippingOrderManagementDetailController extends BaseMesControlle
         }
     }
 
+    @ApiOperation(value = "发运单异常明细", notes = "发运单异常明细")
+    @GetMapping("/master/error/query")
+    public ResultBean queryMesShippingErrorDetailsByPager(MesShippingOrderManagementDetailModel mesShippingOrderManagementDetailModel, Pager pager) {
+        try {
+            return ResultBean.success("查询成功").setListPager(shippingOrderManagementDetailService.queryMesShippingDetailsByPager(mesShippingOrderManagementDetailModel,pager));
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @ApiOperation(value = "根据客户零件匹配零件号", notes = "根据客户零件匹配零件号")
+    @GetMapping("/master/part/supplyBycustPartNo")
+    public ResultBean supplyBycustPartNo(Long[] ids) {
+        try {
+            return shippingOrderManagementDetailService.supplyBycustPartNo(ids);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @ApiOperation(value = "根据CBR匹配零件号", notes = "根据CBR匹配零件号")
+    @GetMapping("/master/part/supplyByCBR")
+    public ResultBean supplyByCBR(Long[] ids) {
+        try {
+            return shippingOrderManagementDetailService.supplyByCBR(ids);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @ApiOperation(value = "根据CBR匹配零件号", notes = "根据CBR匹配零件号")
+    @GetMapping("/master/part/updateQty")
+    public ResultBean supplyByCBR(Long[] ids, double qty) {
+        try {
+            return shippingOrderManagementDetailService.updateQty(ids, qty);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+
     @ApiOperation(value = "发运退回", notes = "发运退回")
     @PutMapping("/doShippingBack")
     public ResultBean doShippingBack(@RequestBody Long[] idList) {

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java

@@ -188,6 +188,8 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
             commonHql.append(" and m.publishTime >= :publishTimeStart ");
         if (!StringUtils.isEmpty(mesShippingOrderManagementDetailModel.getPublishTimeEnd()))
             commonHql.append(" and m.publishTime <= :publishTimeEnd ");
+        if (!StringUtils.isEmpty(mesShippingOrderManagementDetailModel.getDetailsStatus()))
+            commonHql.append(" and d.status = " + mesShippingOrderManagementDetailModel.getDetailsStatus() + "");
         return commonHql.toString();
     }
     @Override

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

@@ -12,13 +12,15 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
-import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderPart;
+import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.repository.MesCimGmCbrRuleRepository;
+import cn.estsh.i3plus.pojo.mes.repository.MesCustomerPartRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesProduceSnRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementDetailRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,6 +48,11 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
 
     @Autowired
     private MesProduceSnRepository mesProduceSnRepository;
+    @Autowired
+    private MesCustomerPartRepository mesCustomerPartRepository;
+
+    @Autowired
+    private MesCimGmCbrRuleRepository mesCimGmCbrRuleRepository;
 
     protected void setPackQueryBean(MesShippingOrderManagementDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
@@ -71,6 +78,60 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
     }
 
     @Override
+    public ListPager<MesShippingOrderManagementDetailModel> queryMesShippingErrorDetailsByPager(MesShippingOrderManagementDetailModel mesShippingOrderManagementDetailModel, Pager pager) {
+        return shippingOrderManagementDetailDao.queryMesShippingDetailsByPager(mesShippingOrderManagementDetailModel, pager);
+    }
+
+
+    @Override
+    public ResultBean supplyBycustPartNo(Long[] ids) {
+
+        String organizeCode = AuthUtil.getOrganizeCode();
+        String userName = AuthUtil.getSessionUser().getUserName();
+        List<MesShippingOrderManagementDetail> detailList = getManagementDetails(ids, organizeCode, userName);
+
+        for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : detailList) {
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+            DdlPreparedPack.getStringEqualPack(mesShippingOrderManagementDetail.getCustPartNo(), "custPartNo", ddlPackBean);
+            MesCustomerPart mesCustomerPart = mesCustomerPartRepository.getByProperty(ddlPackBean);
+            if (mesCustomerPart == null) {
+                log.info("客户零件号不存在:{}", mesShippingOrderManagementDetail.getCustPartNo());
+            }
+            mesShippingOrderManagementDetail.setPartNo(mesCustomerPart.getErpPartNo());
+            mesShippingOrderManagementDetail.setPartName(mesCustomerPart.getErpPartName());
+        }
+
+        return ResultBean.success().setResultList(detailList);
+    }
+
+    @Override
+    public ResultBean supplyByCBR(Long[] ids) {
+
+        String organizeCode = AuthUtil.getOrganizeCode();
+        String userName = AuthUtil.getSessionUser().getUserName();
+        List<MesShippingOrderManagementDetail> detailList = getManagementDetails(ids, organizeCode, userName);
+
+        for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : detailList) {
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+            DdlPreparedPack.getStringEqualPack(mesShippingOrderManagementDetail.getCustPartNo(), "custPartNo", ddlPackBean);
+            MesCimGmCbrRule mesCimGmCbrRule = mesCimGmCbrRuleRepository.getByProperty(ddlPackBean);
+            if (mesCimGmCbrRule == null) {
+                log.info("CBR规则未配置：客户零件号:{}", mesShippingOrderManagementDetail.getCustPartNo());
+            }
+            mesShippingOrderManagementDetail.setPartNo(mesCimGmCbrRule.getErpPartNo());
+            mesShippingOrderManagementDetail.setPartName(mesCimGmCbrRule.getErpPartName());
+        }
+
+        return ResultBean.success().setResultList(detailList);
+    }
+
+
+    @Override
+    public ResultBean updateQty(Long[] ids, double qty) {
+        return null;
+    }
+
+    @Override
     public void doShippingBack(Long[] idList, String organizeCode, String userName) {
         List<MesShippingOrderManagementDetail> detailList = getManagementDetails(idList, organizeCode, userName);
         if (CollectionUtils.isEmpty(detailList)) MesException.throwMesBusiException("选择数据无效,请检查");