问题修改

xpyy/src/main/java/com/xpyy/xpyy/controller/CustomerController.java

@@ -62,6 +62,26 @@ public class CustomerController {
         return customerService.addCustomer(customer,request);
     }
 
+    /**
+     * 新增客户型号
+     * @param customer 参数
+     * @return 返回结果
+     */
+    @PostMapping("addCustomerModel")
+    public Map<String, Object> addCustomerModel(@RequestBody Customer customer, HttpServletRequest request){
+        return customerService.addCustomerModel(customer,request);
+    }
+
+    /**
+     * 新增客户型号下物料
+     * @param customer 参数
+     * @return 返回结果
+     */
+    @PostMapping("addCustomerModelMaterial")
+    public Map<String, Object> addCustomerModelMaterial(@RequestBody Customer customer, HttpServletRequest request){
+        return customerService.addCustomerModelMaterial(customer,request);
+    }
+
     /**
      * 修改客户信息
      * @param customer 参数

xpyy/src/main/java/com/xpyy/xpyy/controller/InventoryController.java

@@ -32,6 +32,16 @@ public class InventoryController {
         return inventoryService.getInventory(inventory);
     }
 
+    /**
+     * 查询物料不分页
+     * @param inventory 参数
+     * @return 返回结果
+     */
+    @GetMapping("getInventorys")
+    public Map<String, Object> getInventorys(Inventory inventory){
+        return inventoryService.getInventorys(inventory);
+    }
+
     /**
      * 查询物料档案列表
      * @param inventory 参数

xpyy/src/main/java/com/xpyy/xpyy/entity/Customer.java

@@ -157,6 +157,50 @@ public class Customer implements Serializable {
      * 删除标志0正常1删除
      */
     private String delflag;
+    /**
+     * 客户型号编码
+     */
+    private String CusStd;
+    /**
+     * 型号名字
+     */
+    private String cCusModelName;
+    /**
+     * 创建日期
+     */
+    private String CreateDate;
+    /**
+     * bomID 型号下物料表主键ID
+     */
+    private String Bomid;
+    /**
+     * 客户编码
+     */
+    private String CusCode;
+    /**
+     * 型号
+     */
+    private String ModeCode;
+    /**
+     * ERP编码，物料编码
+     */
+    private String ErpCode;
+    /**
+     * 品名，物料名称
+     */
+    private String cInvName;
+    /**
+     * 需求数量
+     */
+    private String iNum;
+    /**
+     * 标志0正常1作废
+     */
+    private String flag;
+    /**
+     * 版本
+     */
+    private String version;
     /**
      * 页数
      */
@@ -166,6 +210,94 @@ public class Customer implements Serializable {
      */
     private int limit;
 
+    public String getBomid() {
+        return Bomid;
+    }
+
+    public void setBomid(String bomid) {
+        Bomid = bomid;
+    }
+
+    public String getCusCode() {
+        return CusCode;
+    }
+
+    public void setCusCode(String cusCode) {
+        CusCode = cusCode;
+    }
+
+    public String getModeCode() {
+        return ModeCode;
+    }
+
+    public void setModeCode(String modeCode) {
+        ModeCode = modeCode;
+    }
+
+    public String getErpCode() {
+        return ErpCode;
+    }
+
+    public void setErpCode(String erpCode) {
+        ErpCode = erpCode;
+    }
+
+    public String getcInvName() {
+        return cInvName;
+    }
+
+    public void setcInvName(String cInvName) {
+        this.cInvName = cInvName;
+    }
+
+    public String getiNum() {
+        return iNum;
+    }
+
+    public void setiNum(String iNum) {
+        this.iNum = iNum;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getCusStd() {
+        return CusStd;
+    }
+
+    public void setCusStd(String cusStd) {
+        CusStd = cusStd;
+    }
+
+    public String getcCusModelName() {
+        return cCusModelName;
+    }
+
+    public void setcCusModelName(String cCusModelName) {
+        this.cCusModelName = cCusModelName;
+    }
+
+    public String getCreateDate() {
+        return CreateDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        CreateDate = createDate;
+    }
+
     public String getcCusCode() {
         return cCusCode;
     }

xpyy/src/main/java/com/xpyy/xpyy/mapper/CustomerMapper.java

@@ -25,4 +25,12 @@ public interface CustomerMapper {
     String getCusCodeModelCode(@Param("cusCode") String cusCode, @Param("modelName") String modelName);
 
     List<Map<String, Object>> getCustomerModel(Customer customer);
+
+    List<Map<String, Object>> getCustomerModels(Customer customer1);
+
+    void addCustomerModel(Customer customer);
+
+    List<Map<String, Object>> getCustomerModelMaterialRepetition(Customer customer1);
+
+    void addCustomerModelMaterial(Customer customer);
 }

xpyy/src/main/java/com/xpyy/xpyy/service/CustomerService.java

@@ -24,4 +24,8 @@ public interface CustomerService {
     Map<String, Object> getCustomerModel(Customer customer);
 
     Map<String, Object> getCustomer(Customer customer);
+
+    Map<String, Object> addCustomerModel(Customer customer, HttpServletRequest request);
+
+    Map<String, Object> addCustomerModelMaterial(Customer customer, HttpServletRequest request);
 }

xpyy/src/main/java/com/xpyy/xpyy/service/InventoryService.java

@@ -15,4 +15,6 @@ public interface InventoryService {
     Map<String, Object> delInventory(String id);
 
     Map<String, Object> getInventory(Inventory inventory);
+
+    Map<String, Object> getInventorys(Inventory inventory);
 }

xpyy/src/main/java/com/xpyy/xpyy/service/impl/CustomerServiceImpl.java

@@ -227,6 +227,72 @@ public class CustomerServiceImpl implements CustomerService {
         return map;
     }
 
+    /**
+     * 新增客户型号
+     * @param customer 参数
+     * @return 返回结果
+     */
+    @Override
+    public Map<String, Object> addCustomerModel(Customer customer, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            Customer customer1 = new Customer();
+            customer1.setcCusModelName(customer.getcCusModelName());
+            customer1.setcCusCode(customer.getcCusCode());
+            //查询客户型号名称是否重复
+            List<Map<String,Object>> list = customerMapper.getCustomerModels(customer1);
+            if (list.size() > 0){
+                map.put("msg", "510");
+                map.put("errMsg", "客户型号名称已存在");
+                return map;
+            }
+            String userId = request.getHeader("userId");
+            //创建人员
+            customer.setcCreatePerson(userId);
+            //生成编号cCusCode
+            customer.setCusStd(codeGenerateModel());
+            //新增客户型号
+            customerMapper.addCustomerModel(customer);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    /**
+     * 新增客户型号下物料
+     * @param customer 参数
+     * @return 返回结果
+     */
+    @Override
+    public Map<String, Object> addCustomerModelMaterial(Customer customer, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            Customer customer1 = new Customer();
+            customer1.setCusCode(customer.getCusCode());
+            customer1.setModeCode(customer.getModeCode());
+            customer1.setErpCode(customer.getErpCode());
+            //查询客户该型号下物料已存在是否重复
+            List<Map<String,Object>> list = customerMapper.getCustomerModelMaterialRepetition(customer1);
+            if (list.size() > 0){
+                map.put("msg", "510");
+                map.put("errMsg", "客户该型号下物料已存在");
+                return map;
+            }
+            //新增客户型号下物料
+            customerMapper.addCustomerModelMaterial(customer);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 客户编号规则
      * @return 返回结果
@@ -237,4 +303,15 @@ public class CustomerServiceImpl implements CustomerService {
         stringBuilder.append(l);
         return stringBuilder.toString();
     }
+
+    /**
+     * 客户型号编号规则
+     * @return 返回结果
+     */
+    public String codeGenerateModel(){
+        StringBuilder stringBuilder = new StringBuilder("XH");
+        long l = snowflakeUtil.nextId();
+        stringBuilder.append(l);
+        return stringBuilder.toString();
+    }
 }

xpyy/src/main/java/com/xpyy/xpyy/service/impl/InventoryServiceImpl.java

@@ -143,6 +143,26 @@ public class InventoryServiceImpl implements InventoryService {
         return map;
     }
 
+    /**
+     * 查询物料不分页
+     * @param inventory 参数
+     * @return 返回结果
+     */
+    @Override
+    public Map<String, Object> getInventorys(Inventory inventory) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            List<Map<String,Object>> list = inventoryMapper.getInventory(inventory);
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 物料编号规则
      * @return 返回结果

xpyy/src/main/resources/mapper/CustomerMapper.xml

@@ -7,6 +7,16 @@
         insert into customer(cCusCode,cCusName,cCusAbbName,cCusAddress,cCusRegCode,cCusBank,cCusAccount,cCusEmail,cCusPerson,cCusPhone,cCusFax,cCusMobile,CreateDate,cCreatePerson,delflag)
         values (#{cCusCode},#{cCusName},#{cCusAbbName},#{cCusAddress},#{cCusRegCode},#{cCusBank},#{cCusAccount},#{cCusEmail},#{cCusPerson},#{cCusPhone},#{cCusFax},#{cCusMobile},now(),#{cCreatePerson},0)
     </insert>
+    <!--新增客户型号-->
+    <insert id="addCustomerModel">
+        insert into custocinvtype(cCusCode,CusStd,cCusModelName,CreateDate,cCreatePerson)
+        values (#{cCusCode},#{CusStd},#{cCusModelName},now(),#{cCreatePerson})
+    </insert>
+    <!--新增客户型号下物料-->
+    <insert id="addCustomerModelMaterial">
+        insert into xp_bominfo(CusCode,ModeCode,ErpCode,cInvName,iNum,flag,version)
+        values (#{CusCode},#{ModeCode},#{ErpCode},#{cInvName},#{iNum},0,0)
+    </insert>
     <!--修改客户信息-->
     <update id="updateCustomer">
         update customer
@@ -168,4 +178,32 @@
         from custocinvtype
         where cCusCode = #{cCusCode}
     </select>
+    <!--查询客户型号名称是否重复-->
+    <select id="getCustomerModels" resultType="java.util.Map">
+        select
+            cCusCode,
+            CusStd,
+            cCusModelName,
+            CreateDate,
+            cCreatePerson
+        from custocinvtype
+        where cCusCode = #{cCusCode}
+        and cCusModelName = #{cCusModelName}
+    </select>
+    <!--查询客户该型号下物料已存在是否重复-->
+    <select id="getCustomerModelMaterialRepetition" resultType="java.util.Map">
+        select
+            Bomid,
+            CusCode,
+            ModeCode,
+            ErpCode,
+            cInvName,
+            iNum,
+            flag,
+            version
+        from xp_bominfo
+        where CusCode = #{CusCode}
+        and ModeCode = #{ModeCode}
+        and ErpCode = #{ErpCode}
+    </select>
 </mapper>