问题修改

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

@@ -19,6 +19,26 @@ public class DeliveryController {
     @Autowired
     private DeliveryService deliveryService;
 
+    /**
+     * 查询销售交货单项目名称
+     * @param delivery 参数
+     * @return 返回结果
+     */
+    @GetMapping("getDeliveryName")
+    public Map<String, Object> getDeliveryName(Delivery delivery){
+        return deliveryService.getDeliveryName(delivery);
+    }
+
+    /**
+     * 查询销售交货单编号
+     * @param delivery 参数
+     * @return 返回结果
+     */
+    @GetMapping("getDeliveryCode")
+    public Map<String, Object> getDeliveryCode(Delivery delivery){
+        return deliveryService.getDeliveryCode(delivery);
+    }
+
     /**
      * 查询销售交货单
      * @param delivery 参数

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

@@ -61,4 +61,8 @@ public interface DeliveryMapper {
     String getAllScanNumDelivery(AskGoods askGoods);
 
     List<Map<String, Object>> getEquipmentSoftware(String code);
+
+    List<Delivery> getDeliveryCode(Delivery delivery);
+
+    List<Delivery> getDeliveryProjectName(Delivery delivery);
 }

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

@@ -155,4 +155,16 @@ public class Delivery implements Serializable {
      * 项目名称
      */
     private String projectName;
+    /**
+     * 项目编号
+     */
+    private String projectCode;
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 名称
+     */
+    private String name;
 }

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

@@ -19,4 +19,7 @@ public interface DeliveryService {
 
     Map<String, Object> delDelivery(String id, HttpServletRequest request);
 
+    Map<String, Object> getDeliveryCode(Delivery delivery);
+
+    Map<String, Object> getDeliveryName(Delivery delivery);
 }

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

@@ -167,7 +167,8 @@ public class DeliveryServiceImpl implements DeliveryService {
                 }
                 //查询销售单部分信息
                 Delivery delivery = new Delivery().setDeliveryId(deliveryId).setMaterialId(materialClass.getTldId())
-                        .setEntryNumber(askGoods.getEntryNumber());
+                        .setEntryNumber(askGoods.getEntryNumber())
+                        .setUserId(askGoods.getUserId());
                 List<Delivery> list = deliveryMapper.getDelivery(delivery);
                 deliveryMapper.updateDelivery(materialClass.getTldId(), askGoods.getNum(), deliveryId, askGoods.getEntryNumber()); //修改销售单出库数量
                 if(materialClass.getPartType().equals("产成品")){
@@ -200,35 +201,36 @@ public class DeliveryServiceImpl implements DeliveryService {
                 }
                 askGoodsMapper.deleteVirtual(askGoods.getId());//删除已出虚拟表库存
 
-//                if(materialClass.getPartType().equals("产成品")){
-//                    //查询设备绑定的
-//                    List<Map<String, Object>> list1 = deliveryMapper.getEquipmentSoftware(materialClass.getCode());
-//                    //如果设备绑定软件基础信息有数据则继续往下执行
-//                    if(list.size() != 0){
-//                        Map<String, Object> map1 = list1.get(0);
-//                        Delivery delivery1 = new Delivery()
-//                                .setDeliveryId(deliveryId)
-//                                .setMaterialId(map1.get("materialId").toString())
-//                                .setWbs(list.get(0).getWbs());
-//                        //查询软件类销售出库单据
-//                        List<Delivery> list2 = deliveryMapper.getDelivery(delivery1);
-//                        //如果单据存在  则继续往下执行
-//                        if(list2.size() != 0){
-//                            //修改软件类单据出库数量
-//                            deliveryMapper.updateDelivery(map1.get("materialId").toString(), askGoods.getNum(), deliveryId, list2.get(0).getEntryNumber());
-//                            //存入返回GS信息表内
-//                            ReturRemoval returRemoval = new ReturRemoval()
-//                                    .setMaterialId(map1.get("materialId").toString())
-//                                    .setDocumentId(deliveryId)
-//                                    .setWbs(list.get(0).getWbs())
-//                                    .setNum(askGoods.getNum())
-//                                    .setEntryNumber(list.get(0).getEntryNumber())
-//                                    .setDocumentPointsId(list.get(0).getId())
-//                                    .setStorageLocationCode(askGoods.getStorageLocationCode());
-//                            askGoodsMapper.addReturnGsRemoval(returRemoval);//新增返回gs数据子表信息
-//                        }
-//                    }
-//                }
+                if(materialClass.getPartType().equals("产成品")){
+                    //查询设备绑定的
+                    List<Map<String, Object>> list1 = deliveryMapper.getEquipmentSoftware(materialClass.getCode());
+                    //如果设备绑定软件基础信息有数据则继续往下执行
+                    if(list.size() != 0){
+                        Map<String, Object> map1 = list1.get(0);
+                        Delivery delivery1 = new Delivery()
+                                .setDeliveryId(deliveryId)
+                                .setMaterialId(map1.get("materialId").toString())
+                                .setWbs(list.get(0).getWbs())
+                                .setUserId(askGoods.getUserId());
+                        //查询软件类销售出库单据
+                        List<Delivery> list2 = deliveryMapper.getDelivery(delivery1);
+                        //如果单据存在  则继续往下执行
+                        if(list2.size() != 0){
+                            //修改软件类单据出库数量
+                            deliveryMapper.updateDelivery(map1.get("materialId").toString(), askGoods.getNum(), deliveryId, list2.get(0).getEntryNumber());
+                            //存入返回GS信息表内
+                            ReturRemoval returRemoval = new ReturRemoval()
+                                    .setMaterialId(map1.get("materialId").toString())
+                                    .setDocumentId(deliveryId)
+                                    .setWbs(list.get(0).getWbs())
+                                    .setNum(askGoods.getNum())
+                                    .setEntryNumber(list.get(0).getEntryNumber())
+                                    .setDocumentPointsId(list.get(0).getId())
+                                    .setStorageLocationCode(askGoods.getStorageLocationCode());
+                            askGoodsMapper.addReturnGsRemoval(returRemoval);//新增返回gs数据子表信息
+                        }
+                    }
+                }
                 //存入返回GS信息表内
                 ReturRemoval returRemoval = new ReturRemoval()
                         .setMaterialId(materialClass.getTldId())
@@ -350,6 +352,36 @@ public class DeliveryServiceImpl implements DeliveryService {
         return map;
     }
 
+    @Override
+    public Map<String, Object> getDeliveryCode(Delivery delivery) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<Delivery> list = deliveryMapper.getDeliveryCode(delivery);
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getDeliveryName(Delivery delivery) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<Delivery> list = deliveryMapper.getDeliveryProjectName(delivery);
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 出库单生成
      * @return

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

@@ -220,13 +220,13 @@ public class WarehousingServiceImpl implements WarehousingService {
                 warehousingMapper.addReturnWarehousing(returnWarehousing);
                 warehousingMapper.updateStorage(warehousingVirtual1);//增加入库编号
                 //判断是否有已存在的采购单号
-                if(!stringBuilder.toString().contains(receiveGoods1.getOrderNumber() + ",")){
+//                if(!stringBuilder.toString().contains(receiveGoods1.getOrderNumber() + ",")){
                     stringBuilder.append(receiveGoods1.getOrderNumber() + ",");
-                }
+//                }
                 //半成品扫码入库逻辑
                 //查询物料信息
                 MaterialClass material = warehousingMapper.getMaterial(new Notice().setMaterialCode(warehousingVirtual.getWllbCode()));
-                if(material.getPartType().equals("半成品")) {
+                if(material.getPartType().equals("半成品") || material.getPartType().equals("低值易耗品")) {
                     Notice notice = new Notice()
                             .setMaterialId(receiveGoods1.getMaterialId())
                             .setCompanyNumber(warehousingVirtual.getAccountSleeve())
@@ -298,7 +298,7 @@ public class WarehousingServiceImpl implements WarehousingService {
                 String accessType = "1";
                 String returnGsRemoval = returnData.toString();
                 askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
-                System.out.println("封装好的："+returnData.toString());
+                System.out.println("封装好的：" + returnData.toString());
                 //回传地址
 //                String url = "http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreatePurInStock";
                 String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreatePurInStock";

src/main/resources/mapper/DeliveryMapper.xml

@@ -2,6 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.tld.mapper.DeliveryMapper">
+    <!-- 查询销售单编号 -->
+    <select id="getDeliveryCode" resultType="com.tld.model.Delivery">
+        SELECT
+            DISTINCT b.delivery_code as code,
+                     b.delivery_id as id
+        FROM
+            tld_delivery a
+            JOIN tld_delivery_f b ON a.delivery_id = b.delivery_id
+            join tld_material c on a.material_id = c.tld_id
+        WHERE
+            ( a.gs_delivery_num - a.gs_cancel_num ) != a.out_num
+	AND a.STATUS != '1' and c.code in (select material_id from tld_user_material where user_id = #{userId})
+    </select>
+    <!-- 查询销售单项目名称 -->
+    <select id="getDeliveryProjectName" resultType="com.tld.model.Delivery">
+        SELECT
+            DISTINCT b.project_name as name
+        FROM
+            tld_delivery a
+            JOIN tld_delivery_f b ON a.delivery_id = b.delivery_id
+            join tld_material c on a.material_id = c.tld_id
+        WHERE
+            ( a.gs_delivery_num - a.gs_cancel_num ) != a.out_num
+	AND a.STATUS != '1' and c.code in (select material_id from tld_user_material where user_id = #{userId})
+    </select>
     <!-- 查询销售交货单 -->
     <select id="getDelivery" resultType="com.tld.model.Delivery">
         select

src/main/resources/mapper/WarehousingMapper.xml

@@ -215,7 +215,7 @@
                ifnull(b.code, '') as wbsCode,
                ifnull(b.name, '') as wbsName
         from tld_return_gs_warehousing a
-                 left join tld_wbs b on a.wbs = b.tld_id
+        left join tld_wbs b on a.wbs = b.tld_id
         where #{orderNumber} LIKE CONCAT('%', CONCAT(order_number, ','), '%')
     </select>
     <!-- 查询入库流水 -->