问题修改

src/main/java/com/tld/controller/GsAccessController.java

@@ -50,6 +50,17 @@ public class GsAccessController {
         return dictionaryService.addDictionary(dictionarys);
     }
 
+    /**
+     * 采购到料信息大屏
+     * @param jsonData 参数
+     * @return 返回结果
+     */
+    @PostMapping("addPurchase")
+    @PassToken
+    public Map<String, Object> addPurchase(@RequestBody List<Map<String,Object>> jsonData){
+        return receiveGoodsSerivce.addPurchase(jsonData);
+    }
+
     /**
      * gs存入采购信息
      * @param jsonData 参数

src/main/java/com/tld/controller/UserController.java

@@ -86,21 +86,23 @@ public class UserController {
         userService.userExport(user, response);
     }
 
+    /**
+     * 重置密码
+     * @param user 参数
+     * @return 返回结果
+     */
+    @PostMapping("resetPassword")
+    public Map<String, Object> resetPassword(@RequestBody User user){
+        return userService.resetPassword(user);
+    }
 
-
-    public static void main(String[] args) {
-        String url = "http://localhost:9520/user/test";
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("name", "xiaohuang");
-        map.put("sex", "female");
-        String str = HttpClientUtil.doGet(url, map);
-        System.out.println("------------------------------");
-        Map<String, String> mapData = (Map<String, String>) JSON.parse(str);
-        List<Object> list = JSONArray.parseArray(JSON.toJSONString(mapData.get("data")));
-        for(Object val : list){
-            System.out.println(val);
-        }
-        System.out.println(mapData);
-        System.out.println("------------------------------");
+    /**
+     * 修改密码
+     * @param user 参数
+     * @return 返回结果
+     */
+    @PostMapping("updatePassword")
+    public Map<String, Object> updatePassword(@RequestBody User user){
+        return userService.updatePassword(user);
     }
 }

src/main/java/com/tld/mapper/MaterialClassMapper.java

@@ -17,5 +17,5 @@ public interface MaterialClassMapper {
 
     void updateMaterial(MaterialClass materialClass);
 
-    int getMaterialClassStorageLocation(String storageLocationCode);
+    String getMaterialClassStorageLocation(String storageLocationCode);
 }

src/main/java/com/tld/mapper/ReceiveGoodsMapper.java

@@ -4,6 +4,7 @@ import com.tld.model.ReceiveGoods;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface ReceiveGoodsMapper {
@@ -21,4 +22,7 @@ public interface ReceiveGoodsMapper {
 
     void addReceiveGoodsf(ReceiveGoods receiveGoods);
 
+    void addPurchase(List<Map<String, Object>> jsonData);
+
+    void updatePurchaseType(ReceiveGoods receiveGoods);
 }

src/main/java/com/tld/mapper/UserMapper.java

@@ -24,4 +24,6 @@ public interface UserMapper {
     List<Map<String, Object>> getUserExportData(User user);
 
     int getUserIsNot(User user);
+
+    User getUser(User user);
 }

src/main/java/com/tld/model/User.java

@@ -28,6 +28,10 @@ public class User implements Serializable {
      * 密码
      */
     private String password;
+    /**
+     * 新密码
+     */
+    private String newPassword;
     /**
      * 真实姓名
      */

src/main/java/com/tld/service/ReceiveGoodsSerivce.java

@@ -15,4 +15,6 @@ public interface ReceiveGoodsSerivce {
     Map<String, Object> addReceiveGoods(List<Map<String,Object>> jsonData);
 
     Map<String, Object> addReceiveGoodsConfirm(ReceiveGoods receiveGoods);
+
+    Map<String, Object> addPurchase(List<Map<String, Object>> jsonData);
 }

src/main/java/com/tld/service/UserService.java

@@ -19,4 +19,7 @@ public interface UserService {
 
     void userExport(User user, HttpServletResponse response);
 
+    Map<String, Object> resetPassword(User user);
+
+    Map<String, Object> updatePassword(User user);
 }

src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tld.excel.ExcelUtils;
 import com.tld.mapper.AskGoodsMapper;
+import com.tld.mapper.DeliveryMapper;
 import com.tld.mapper.ErrorMapper;
 import com.tld.mapper.WarehousingMapper;
 import com.tld.model.*;
@@ -36,6 +37,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     private WarehousingMapper warehousingMapper;
     @Autowired
     private ErrorMapper errorMapper;
+    @Autowired
+    private DeliveryMapper deliveryMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -522,6 +525,31 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 inventory.setAmount(askGoods.getNum());
                 askGoodsMapper.updateInventory(inventory);
             }
+            if(material.getPartType().equals("半成品")){
+                //新增半成品出库流水
+                AskGoods askGoods1 = new AskGoods()
+                        .setWllbCode(material.getWllbCode())
+                        .setNum(askGoods.getNum())
+                        .setUserId(askGoods.getUserId())
+                        .setAskGoodsId("")
+                        .setDepartment(askGoods.getDepartment());//新增出库流水
+                warehousingMapper.addRemovalHalfProduct(askGoods1);
+            } else if(material.getPartType().equals("产成品")){
+                //产成品销售流水
+                Delivery delivery1 = new Delivery()
+                        .setMaterialCode(material.getWllbCode()) //物料code
+                        .setOutNum(askGoods.getNum()) //出库数量
+                        .setUserId(askGoods.getUserId()) //用户id
+                        .setDeliveryId("") //销售单id
+                        .setCompanyNumber("") //公司编号
+                        .setCustomerCode(""); //客户编号
+                deliveryMapper.addRemovalHalf(delivery1); //流水录入
+            } else {
+                askGoods.setSupplierId(inventory.getSupplierId());
+                askGoods.setType("其他出库");
+                askGoods.setProducDate(inventory.getProducDate());
+                askGoodsMapper.addRemoval(askGoods);//插入出库流水
+            }
             //新增返回gs信息
             String removalCode = codeGenerateCk();
             ReturRemoval returRemoval = new ReturRemoval()
@@ -531,9 +559,13 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     .setStorageLocationCode(inventory.getStorageLocationCode())
                     .setRemovalCode(removalCode)
                     .setSourceType("0")
-                    .setMoveType("209");
+                    .setMoveType("209")
+                    .setDocumentId(removalCode)
+                    .setDocumentPointsId(removalCode);
             askGoodsMapper.addReturnGsRemovalF(returRemoval);//新增返回gs数据父表信息
             askGoodsMapper.addReturnGsRemoval(returRemoval);//新增返回gs数据子表信息
+            map.put("data", removalCode);
+            map.put("msg", "200");
         }catch (Exception e){
             map.put("msg", "500");
             map.put("errMsg", "失败");

src/main/java/com/tld/service/impl/MaterialClassServiceImpl.java

@@ -55,12 +55,17 @@ public class MaterialClassServiceImpl implements MaterialClassService {
     public Map<String, Object> addMaterialClass(MaterialClass materialClass) {
         Map<String, Object> map = new HashMap<>();
         try{
-            int count = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
-            if(count > 0){
+            String wllbCode = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
+            if(!materialClass.getWllbCode().equals(wllbCode) && wllbCode != null){
                 map.put("msg", "500");
                 map.put("errMsg", "库位已被占用");
                 return map;
             }
+            if(materialClass.getWllbCode().equals(wllbCode)){
+                map.put("msg", "500");
+                map.put("errMsg", "切勿重复录入");
+                return map;
+            }
             materialClassMapper.addMaterialClass(materialClass);
             map.put("msg", "200");
         }catch (Exception e){
@@ -76,6 +81,12 @@ public class MaterialClassServiceImpl implements MaterialClassService {
     public Map<String, Object> updateMaterialClass(MaterialClass materialClass) {
         Map<String, Object> map = new HashMap<>();
         try{
+            String wllbCode = materialClassMapper.getMaterialClassStorageLocation(materialClass.getStorageLocationCode());
+            if(!wllbCode.equals(materialClass.getWllbCode()) && !wllbCode.equals("")){
+                map.put("msg", "500");
+                map.put("errMsg", "库位已被占用");
+                return map;
+            }
             materialClassMapper.updateMaterialClass(materialClass);
             map.put("msg", "200");
         }catch (Exception e){

src/main/java/com/tld/service/impl/ReceiveGoodsSerivceImpl.java

@@ -101,6 +101,7 @@ public class ReceiveGoodsSerivceImpl implements ReceiveGoodsSerivce {
                        }
                        receiveGoodsMapper.addReceiveGoods(receiveGoods);
                    }
+                   receiveGoodsMapper.updatePurchaseType(receiveGoods);
                    //采购单日志
                    receiveGoodsMapper.addReceiveGoodsLog(receiveGoods);
                }
@@ -130,4 +131,19 @@ public class ReceiveGoodsSerivceImpl implements ReceiveGoodsSerivce {
         }
         return map;
     }
+
+    @Override
+    public Map<String, Object> addPurchase(List<Map<String, Object>> jsonData) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            receiveGoodsMapper.addPurchase(jsonData);
+            map.put("status", "0000");
+            map.put("msg","成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("status", "0009");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

src/main/java/com/tld/service/impl/UserServiceImpl.java

@@ -181,6 +181,44 @@ public class UserServiceImpl implements UserService {
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> resetPassword(User user) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            user.setPassword(DesEncry.encrypt("123456"));
+            userMapper.updateUser(user);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> updatePassword(User user) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            User user1 = userMapper.getUser(user);
+            if(!user.getPassword().equals(DesDecry.decrypt(user1.getPassword()))){
+                map.put("msg", "500");
+                map.put("errMsg", "密码错误");
+                return map;
+            }
+            user.setPassword(DesEncry.encrypt(user.getNewPassword()));
+            userMapper.updateUser(user);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
 
     /**
      * 用户编号规则

src/main/resources/mapper/AskGoodsMapper.xml

@@ -35,11 +35,14 @@
     <!-- 查询生产领料单 -->
     <select id="getAskGoodsfList" resultType="com.tld.model.AskGoods">
         select
-               a.ask_goods_id,
+               DISTINCT a.ask_goods_id,
                a.ask_goods_code,
                b.name as departmentName
         from tld_ask_goods_f a
+        join tld_ask_goods d on a.ask_goods_id = d.ask_goods_id
         left join tld_department b on a.department = b.tld_id
+        join tld_material c on d.material_id = c.tld_id
+        where c.part_type != '半成品'
         order by a.sqrq desc
     </select>
     <!-- 查询指定生产单的物料 -->
@@ -517,6 +520,6 @@
             scrq,
             produc_batch,
             attribute
-        from tld_inventory where storage_location_code = #{storageLocationCode} and material_id = #{materialId}
+        from tld_inventory where storage_location_code = #{storageLocationCode} and material_id = #{materialId} and wbs = #{wbs}
     </select>
 </mapper>

src/main/resources/mapper/MaterialClassMapper.xml

@@ -74,7 +74,7 @@
         where tld_id = #{id}
     </update>
     <!-- 查询库位是否被占用 -->
-    <select id="getMaterialClassStorageLocation" resultType="int">
-        select count(*) from tld_material_class where storage_location_code = #{storageLocationCode}
+    <select id="getMaterialClassStorageLocation" resultType="String">
+        select DISTINCT wllb_code from tld_material_class where storage_location_code = #{storageLocationCode}
     </select>
 </mapper>

src/main/resources/mapper/ReceiveGoodsMapper.xml

@@ -123,4 +123,16 @@
         insert into tld_receive_goods_log(order_number, order_code, company_number, supplier_id, arrival_time, order_type, source_type, move_type, material_id, purchase_num, arrival_num, qualified_num, disqualification_num, wbs, measurement_id)
         values (#{orderNumber}, #{orderCode}, #{companyNumber}, #{supplierId}, #{arrivalTime}, #{orderType}, #{sourceType}, #{moveType}, #{materialId}, #{purchaseNum}, #{arrivalNum}, #{qualifiedNum}, #{disqualificationNum}, #{wbs}, #{measurementId})
     </insert>
+    <!-- 新增采购到料大屏信息 -->
+    <insert id="addPurchase">
+        insert into tld_purchase(supplier_id,order_code,material_id,purchase_num,arrival_num,arrival_time,type)
+        values
+        <foreach collection="jsonData" index="index" item="item" separator=",">
+            (#{item.supplierId},#{item.orderCode},#{item.materialId},#{item.purchaseNum},#{item.arrivalNum},#{item.arrivalTime},'0')
+        </foreach>
+    </insert>
+
+    <update id="updatePurchaseType">
+        update tld_purchase set type = '1' where order_code = #{orderCode}
+    </update>
 </mapper>

src/main/resources/mapper/UserMapper.xml

@@ -133,4 +133,20 @@
         </trim>
         order by a.id desc
     </select>
+    <!-- 查询指定用户内容 -->
+    <select id="getUser" resultType="com.tld.model.User">
+        select
+            id,
+            code,
+            user_name,
+            password,
+            real_name,
+            email,
+            landline,
+            phone,
+            department,
+            role
+        from tld_user
+        where id = #{id}
+    </select>
 </mapper>