问题修改

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

@@ -22,6 +22,16 @@ public class InventoryController {
     @Autowired
     private InventoryService inventoryService;
 
+    /**
+     * 查询物料
+     * @param inventory 参数
+     * @return 返回结果
+     */
+    @GetMapping("getInventory")
+    public Map<String, Object> getInventory(Inventory inventory){
+        return inventoryService.getInventory(inventory);
+    }
+
     /**
      * 查询物料档案列表
      * @param inventory 参数
@@ -52,4 +62,14 @@ public class InventoryController {
     public Map<String, Object> updateInventory(@RequestBody Inventory inventory, HttpServletRequest request){
         return inventoryService.updateInventory(inventory, request);
     }
+
+    /**
+     * 删除物料
+     * @param erpCode 参数
+     * @return 返回结果
+     */
+    @DeleteMapping("delInventory")
+    public Map<String, Object> delInventory(String erpCode){
+        return inventoryService.delInventory(erpCode);
+    }
 }

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

@@ -14,4 +14,10 @@ public interface InventoryMapper {
     List<Map<String, Object>> getInventorySupplier(@Param("erpCode") String erpCode);
 
     void addInventory(Inventory inventory);
+
+    void updateInventory(Inventory inventory);
+
+    void delInventory(String id);
+
+    List<Map<String,Object>> getInventory(Inventory inventory);
 }

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

@@ -11,4 +11,8 @@ public interface InventoryService {
     Map<String, Object> addInventory(Inventory inventory, HttpServletRequest request);
 
     Map<String, Object> updateInventory(Inventory inventory, HttpServletRequest request);
+
+    Map<String, Object> delInventory(String id);
+
+    Map<String, Object> getInventory(Inventory inventory);
 }

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

@@ -89,25 +89,58 @@ public class InventoryServiceImpl implements InventoryService {
      */
     @Override
     public Map<String, Object> updateInventory(Inventory inventory, HttpServletRequest request) {
-//        Map<String, Object> map = new HashMap<>();
-//        try{
-//            int count = userMapper.getUserIsNot(user);
-//            if(count > 0){
-//                map.put("msg", "510");
-//                map.put("errMsg", "用户名已存在");
-//                return map;
-//            }
-//            user.setPassword(DesEncry.encrypt(user.getPassword()));
-//            user.setModifyUser(request.getHeader("userId"));
-//            userMapper.updateUser(user);
-//            map.put("msg", "200");
-//        } catch (Exception e){
-//            e.printStackTrace();
-//            map.put("msg", "500");
-//            map.put("errMsg", "服务器请求异常，请稍后再试");
-//        }
-//        return map;
-        return null;
+        Map<String, Object> map = new HashMap<>();
+        try{
+            //修改物料信息
+            inventory.setUpperson(request.getHeader("userId"));
+            inventoryMapper.updateInventory(inventory);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    /**
+     * 删除物料
+     * @param id 参数
+     * @return 返回结果
+     */
+    @Override
+    public Map<String, Object> delInventory(String id) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            inventoryMapper.delInventory(id);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    /**
+     * 查询物料
+     * @param inventory 参数
+     * @return 返回结果
+     */
+    @Override
+    public Map<String, Object> getInventory(Inventory inventory) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            PageHelper.startPage(inventory.getPage(), inventory.getLimit());
+            PageInfo<Map<String,Object>> list = new PageInfo<>(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;
     }
 
     /**

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

@@ -7,6 +7,95 @@
         insert into inventory(ErpCode,Pcode,cInvName,cInvStd,cPcode,cVenPCode,Materal,CCode,dSDate,cComUnitCode,cAssComUnitCode,Createperson,delflag,isbatch)
         values (#{ErpCode},#{Pcode},#{cInvName},#{cInvStd},#{cPcode},#{cVenPCode},#{Materal},#{cCode},now(),#{cComUnitCode},#{cAssComUnitCode},#{Createperson},0,0)
     </insert>
+    <!--修改物料信息-->
+    <update id="updateInventory">
+        update inventory
+        <set>
+            <trim suffixOverrides=",">
+                <if test="Pcode != null and Pcode != ''">
+                    Pcode = #{Pcode},
+                </if>
+                <if test="cInvName != null and cInvName != ''">
+                    cInvName = #{cInvName},
+                </if>
+                <if test="cInvStd != null and cInvStd != ''">
+                    cInvStd = #{cInvStd},
+                </if>
+                <if test="cPcode != null and cPcode != ''">
+                    cPcode = #{cPcode},
+                </if>
+                <if test="cVenPCode != null and cVenPCode != ''">
+                    cVenPCode = #{cVenPCode},
+                </if>
+                <if test="Materal != null and Materal != ''">
+                    Materal = #{Materal},
+                </if>
+                <if test="cCode != null and cCode != ''">
+                    CCode = #{cCode},
+                </if>
+                <if test="cInvDefine1 != null and cInvDefine1 != ''">
+                    cInvDefine1 = #{cInvDefine1},
+                </if>
+                <if test="cInvDefine2 != null and cInvDefine2 != ''">
+                    cInvDefine2 = #{cInvDefine2},
+                </if>
+                <if test="cInvDefine3 != null and cInvDefine3 != ''">
+                    cInvDefine3 = #{cInvDefine3},
+                </if>
+                <if test="cInvDefine4 != null and cInvDefine4 != ''">
+                    cInvDefine4 = #{cInvDefine4},
+                </if>
+                <if test="cInvDefine5 != null  and cInvDefine5 != ''">
+                    cInvDefine5 = #{cInvDefine5},
+                </if>
+                <if test="cInvDefine6 != null and cInvDefine6 != ''">
+                    cInvDefine6 = #{cInvDefine6},
+                </if>
+                <if test="cInvDefine7 != null and cInvDefine7 != ''">
+                    cInvDefine7 = #{cInvDefine7},
+                </if>
+                <if test="cInvDefine8 != null and cInvDefine8 != ''">
+                    cInvDefine8 = #{cInvDefine8},
+                </if>
+                <if test="cInvDefine9 != null and cInvDefine9 != ''">
+                    cInvDefine9 = #{cInvDefine9},
+                </if>
+                <if test="cInvDefine10 != null and cInvDefine10 != ''">
+                    cInvDefine10 = #{cInvDefine10},
+                </if>
+                <if test="cInvDefine11 != null and cInvDefine11 != ''">
+                    cInvDefine11 = #{cInvDefine11},
+                </if>
+                <if test="cInvDefine12 != null and cInvDefine12 != ''">
+                    cInvDefine12 = #{cInvDefine12},
+                </if>
+                <if test="cInvDefine13 != null and cInvDefine13 != ''">
+                    cInvDefine13 = #{cInvDefine13},
+                </if>
+                <if test="cInvDefine14 != null and cInvDefine14 != ''">
+                    cInvDefine14 = #{cInvDefine14},
+                </if>
+                <if test="cInvDefine15 != null and cInvDefine15 != ''">
+                    cInvDefine15 = #{cInvDefine15},
+                </if>
+                <if test="cInvDefine16 != null and cInvDefine16 != ''">
+                    cInvDefine16 = #{cInvDefine16},
+                </if>
+                <if test="delflag != null and delflag != ''">
+                    delflag = #{delflag},
+                </if>
+                <if test="isbatch != null and isbatch != ''">
+                    isbatch = #{isbatch},
+                </if>
+                upperson = #{upperson},dupDate=now(),
+            </trim>
+        </set>
+        where ErpCode = #{ErpCode}
+    </update>
+    <!--删除物料-->
+    <delete id="delInventory">
+        delete from inventory where ErpCode = #{id}
+    </delete>
 
     <!--查询物料档案列表-->
     <select id="getInventoryList" resultType="java.util.Map">
@@ -50,4 +139,137 @@
         where a.ErpCode = #{erpCode}
         order by a.ID desc
     </select>
+    <!--查询物料-->
+    <select id="getInventory" resultType="java.util.Map">
+        select
+            ErpCode,
+            Pcode,
+            cInvName,
+            cInvStd,
+            cPcode,
+            cVenPCode,
+            Materal,
+            CCode,
+            dSDate,
+            dupDate,
+            cComUnitCode,
+            Createperson,
+            cAssComUnitCode,
+            upperson,
+            cInvDefine1,
+            cInvDefine2,
+            cInvDefine3,
+            cInvDefine4,
+            cInvDefine5,
+            cInvDefine6,
+            cInvDefine7,
+            cInvDefine8,
+            cInvDefine9,
+            cInvDefine10,
+            cInvDefine11,
+            cInvDefine12,
+            cInvDefine13,
+            cInvDefine14,
+            cInvDefine15,
+            cInvDefine16,
+            delflag,
+            isbatch
+        from inventory
+        <trim prefix="WHERE" prefixOverrides="and |or">
+            <if test="ErpCode != null and ErpCode != ''">
+                and ErpCode like CONCAT(CONCAT('%', #{ErpCode}), '%')
+            </if>
+            <if test="Pcode != null and Pcode != ''">
+                and Pcode like CONCAT(CONCAT('%', #{Pcode}), '%')
+            </if>
+            <if test="cInvName != null and cInvName != ''">
+                and cInvName like CONCAT(CONCAT('%', #{cInvName}), '%')
+            </if>
+            <if test="cInvStd != null and cInvStd != ''">
+                and cInvStd like CONCAT(CONCAT('%', #{cInvStd}), '%')
+            </if>
+            <if test="cPcode != null and cPcode != ''">
+                and cPcode like CONCAT(CONCAT('%', #{cPcode}), '%')
+            </if>
+            <if test="cVenPCode != null and cVenPCode != ''">
+                and cVenPCode like CONCAT(CONCAT('%', #{cVenPCode}), '%')
+            </if>
+            <if test="Materal != null and Materal != ''">
+                and Materal like CONCAT(CONCAT('%', #{Materal}), '%')
+            </if>
+            <if test="dSDate != null and dSDate != ''">
+                and dSDate like CONCAT(CONCAT('%', #{dSDate}), '%')
+            </if>
+            <if test="dupDate != null and dupDate != ''">
+                and dupDate like CONCAT(CONCAT('%', #{dupDate}), '%')
+            </if>
+            <if test="cComUnitCode != null and cComUnitCode != ''">
+                and cComUnitCode = #{cComUnitCode}
+            </if>
+            <if test="Createperson != null and Createperson != ''">
+                and Createperson = #{Createperson}
+            </if>
+            <if test="cAssComUnitCode != null and cAssComUnitCode != ''">
+                and cAssComUnitCode = #{cAssComUnitCode}
+            </if>
+            <if test="upperson != null and upperson != ''">
+                and upperson = #{upperson}
+            </if>
+            <if test="delflag != null and delflag != ''">
+                and delflag = #{delflag}
+            </if>
+            <if test="isbatch != null and isbatch != ''">
+                and isbatch = #{isbatch}
+            </if>
+            <if test="cInvDefine1 != null and cInvDefine1 != ''">
+                and cInvDefine1 = #{cInvDefine1}
+            </if>
+            <if test="cInvDefine2 != null and cInvDefine2 != ''">
+                and cInvDefine2 = #{cInvDefine2}
+            </if>
+            <if test="cInvDefine3 != null and cInvDefine3 != ''">
+                and cInvDefine3 = #{cInvDefine3}
+            </if>
+            <if test="cInvDefine4 != null and cInvDefine4 != ''">
+                and cInvDefine4 = #{cInvDefine4}
+            </if>
+            <if test="cInvDefine5 != null and cInvDefine5 != ''">
+                and cInvDefine5 = #{cInvDefine5}
+            </if>
+            <if test="cInvDefine6 != null and cInvDefine6 != ''">
+                and cInvDefine6 = #{cInvDefine6}
+            </if>
+            <if test="cInvDefine7 != null and cInvDefine7 != ''">
+                and cInvDefine7 = #{cInvDefine7}
+            </if>
+            <if test="cInvDefine8 != null and cInvDefine8 != ''">
+                and cInvDefine8 = #{cInvDefine8}
+            </if>
+            <if test="cInvDefine9 != null and cInvDefine9 != ''">
+                and cInvDefine9 = #{cInvDefine9}
+            </if>
+            <if test="cInvDefine10 != null and cInvDefine10 != ''">
+                and cInvDefine10 = #{cInvDefine10}
+            </if>
+            <if test="cInvDefine11 != null and cInvDefine11 != ''">
+                and cInvDefine11 = #{cInvDefine11}
+            </if>
+            <if test="cInvDefine12 != null and cInvDefine12 != ''">
+                and cInvDefine12 = #{cInvDefine12}
+            </if>
+            <if test="cInvDefine13 != null and cInvDefine13 != ''">
+                and cInvDefine13 = #{cInvDefine13}
+            </if>
+            <if test="cInvDefine14 != null and cInvDefine14 != ''">
+                and cInvDefine14 = #{cInvDefine14}
+            </if>
+            <if test="cInvDefine15 != null and cInvDefine15 != ''">
+                and cInvDefine15 = #{cInvDefine15}
+            </if>
+            <if test="cInvDefine16 != null and cInvDefine16 != ''">
+                and cInvDefine16 = #{cInvDefine16}
+            </if>
+        </trim>
+        order by dSDate desc
+    </select>
 </mapper>