零件发运组--客户工厂与信息点联动

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

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
 
+import java.util.List;
+
 /**
  * @Description:
  * @CreateDate 2024/04/16
@@ -10,4 +12,11 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
 public interface IMesCustomerMessagePointService extends IBaseMesService<MesCustomerMessagePoint> {
 
         MesCustomerMessagePoint getPointByCode(String pointCode,String organizeCode);
+
+        /**
+         * 根据客户工厂代码查找对应的
+         * @param custOrganizeCode
+         * @return
+         */
+        List<MesCustomerMessagePoint> getByCustOrganizeCode(String custOrganizeCode);
 }

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

@@ -1,15 +1,37 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
+import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesCustomerMessagePointService;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 客户信息点
  */
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerMessagePoint")
 public class MesCustomerMessagePointController extends BaseMesController<MesCustomerMessagePoint>{
+
+    @Autowired
+    private MesCustomerMessagePointService mesCustomerMessagePointService;
+    //根据客户工厂查找对应的信息点信息
+    @GetMapping("/list/{custOrganizeCode}")
+    @ApiOperation(value = "查询当前客户工厂的信息点", notes = "查询当前客户工厂的信息点")
+    public ResultBean list(@PathVariable("custOrganizeCode") String custOrganizeCode){
+        try {
+            List<MesCustomerMessagePoint> messagePoints = mesCustomerMessagePointService.getByCustOrganizeCode(custOrganizeCode);
+            return ResultBean.success("查询成功").setResultList(messagePoints);
+        } catch (Exception e) {
+            return ResultBean.fail("查询失败").setErrorMsg(e.getMessage());
+        }
+    }
 }

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

@@ -6,12 +6,12 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -65,4 +65,11 @@ public class MesCustomerMessagePointService extends BaseMesService<MesCustomerMe
         List<MesCustomerMessagePoint> messagePoints = baseRDao.findByHqlWhere(ddlPackBean);
         return messagePoints.isEmpty() ? null: messagePoints.get(0);
     }
+
+    @Override
+    public List<MesCustomerMessagePoint> getByCustOrganizeCode(String custOrganizeCode) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(custOrganizeCode, "custOrganizeCode", ddlPackBean);
+        return baseRDao.findByHqlWhere(ddlPackBean);
+    }
 }