Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -1325,4 +1325,11 @@ public class OmstruckOrderController extends BaseRESTfulController {
         List<Map<String, Object>> mapList = omstruckOrderService.getWarehouseMes(mapValue);
         return success(mapList);
     }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/closeInwardOrderByPlan")
+    public RESTfulResult closeInwardOrderByPlan(@RequestParam Integer planId) {
+        int result = omstruckOrderMapper.closeInwardOrderByPlan(new BigDecimal(planId));
+        return success(result);
+    }
 }

src/main/java/com/steerinfo/dil/controller/OmstruckOrderMaterialController.java

@@ -1,15 +1,16 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.druid.support.json.JSONUtils;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
-import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
 import com.steerinfo.dil.service.impl.OmstruckOrderMaterialServiceImpl;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.*;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +41,15 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
     @Autowired
     OmstruckOrderMapper omstruckOrderMapper;
 
+    @Autowired
+    JoinFeign joinFeign;
+
+    @Autowired
+    EASUtil easUtil;
+
+    @Autowired
+    EASDeleteTestUtil easDeleteTestUtil;
+
     @ApiOperation(value = "查询钢材订单号")
     @GetMapping("getSteelOrderNum")
     public RESTfulResult getSteelOrderNum(String capacityId){
@@ -58,6 +68,22 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
     @PostMapping("updateMaterialMes")
     public RESTfulResult updateMaterialMes(@RequestBody(required = false) Map<String, Object> map){
         int i = omstruckOrderMaterialService.updateMaterialMes(map);
+        BigDecimal saleOrderId = DataChange.dataToBigDecimal(map.get("saleOrderId"));
+//         调用金蝶接口，将销售订单推送到金蝶系统
+        Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+        Map<String, Object> head = (Map<String, Object>) input.get("head");
+        head.put("status", "update");
+        // 获得金蝶接口配置:正式
+        Map<String, Object> totalMap = easUtil.getTotalMap();
+//        // 获得金蝶接口配置:测试
+//        Map<String, Object> totalMap = easDeleteTestUtil.getTotalMap();
+        // 组装报文
+        totalMap.put("input", input);
+        System.out.println(totalMap);
+        String json = JSONUtils.toJSONString(totalMap);
+        System.out.println(json);
+        Map<String,Object> resultMap = joinFeign.pushSaleOrderToEas(totalMap);
+        System.out.println(resultMap);
         return success(i);
     }
 }

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -33,4 +33,8 @@ public interface JoinFeign {
     // 查询车牌号和金蝶分录
     @PostMapping("/api/v1/join/amssaleorder/findCarNumberByOrderId")
     Map<String,Object> findCarNumberByOrderId(@RequestParam BigDecimal saleOrderMaterialId);
+
+    // 减少物资件数同步金蝶接口
+    @PostMapping("/api/v1/join/wsface/downMaterialNumber")
+    Map<String,Object> downMaterialNumber(@RequestBody Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -347,4 +347,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     String canCapacityEnfactory(Map<String, Object> mapValue);
     // 出库信息
     List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
+    // 通过运单下的物资信息
+    int closeInwardOrderByPlan(BigDecimal bigDecimal);
 }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.java

@@ -57,4 +57,6 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
 
 
     int updateSaleOrderMaterialMes(BigDecimal saleMaterialId, BigDecimal materialNum, BigDecimal newWeight);
+
+    Map<String,Object> findDownMaterial(BigDecimal saleMaterialId);
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderMaterialServiceImpl.java

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.druid.support.json.JSONUtils;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
@@ -9,6 +11,7 @@ import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.EASMaterialNumberUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +49,12 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
     @Autowired
     RmsPwarehouseGridMapper rmsPwarehouseGridMapper;
 
+    @Autowired
+    JoinFeign joinFeign;
+
+    @Autowired
+    EASMaterialNumberUtil easMaterialNumberUtil;
+
     /**
      * 远程调用订单子表新增
      *

src/main/java/com/steerinfo/dil/util/EASMaterialNumberUtil.java

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶测试环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASMaterialNumberUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "A004";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "changeActualQtyHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/java/com/steerinfo/dil/util/EASUtil.java

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶正式环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "FDDGEAS85";
+    public final String dbType = "1";
+    public final String userName = "user";
+    // context
+    public final String command = "saveSaleOrderBillHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -4056,5 +4056,12 @@
         )
         ORDER BY "orderNumber" DESC
     </select>
+    
+    <update id="closeInwardOrderByPlan" parameterType="DECIMAL" >
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 7
+        WHERE OO.ORDER_PLAN_ID = #{planId}
+        AND OO.ORDER_TYPE = 11
+    </update>
 
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.xml

@@ -569,4 +569,16 @@
     </if>
     where SALE_MATERIAL_ID = #{saleMaterialId}
   </update>
+
+  <select id="findDownMaterial" parameterType="DECIMAL" resultType="java.util.Map" >
+    SELECT ASO.SALE_NUMBER      "number",
+           ASM.EAS_PRIMARY_ID   "changeEntryId",
+           ASM.SALE_MATERIAL_ID "wlEntryId"
+    FROM AMS_SALE_MATERIAL ASM
+           LEFT JOIN AMS_SALE_ORDER ASO
+                     ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     ON ASM.MATERIAL_ID = RM.MATERIAL_ID
+    WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
+  </select>
 </mapper>