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

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

@@ -89,4 +89,21 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
         }
         return success(i);
     }
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-09
+     * @Description:点击
+    */
+    @ApiOperation(value = "修改正在装的信息")
+    @PostMapping("updateContinueStaus")
+    public RESTfulResult updateContinueStaus(@RequestBody(required = false) Map<String, Object> map){
+        int i = omstruckOrderMaterialService.updateContinueStaus(map);
+        if (i==0){
+            return failed("修改失败");
+        }else {
+           return success("修改成功");
+        }
+    }
 }

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

@@ -62,4 +62,5 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
 
     int updateSteelOrderType4(BigDecimal orderId);
 
+    int updateContinueStaus(Integer orderId);
 }

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

@@ -63,9 +63,9 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
 
     private  String guoYuanUrl="http://113.204.217.110:9810/dagang/receiving";
     //城嘉库登录访问接口
-    private  String chengJiaLoginUrl="http://122.112.226.137:8083/dagon/login";
+    private  String chengJiaLoginUrl="http://116.204.73.104:8083/dagon/login";
     //城嘉库推送数据接口
-    private  String chengJiaSendUrl="http://122.112.226.137:8083/dagon/selectSaleSteelOrder";
+    private  String chengJiaSendUrl="http://116.204.73.104:8083/dagon/selectSaleSteelOrder";
 
     @Bean
     @LoadBalanced

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

@@ -358,4 +358,17 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
         }
         return 1;
     }
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-09
+     * @Description:修改装货
+    */
+    public int updateContinueStaus(Map<String, Object> map){
+        Integer orderId = (Integer) map.get("orderId");
+        int result=0;
+        result+=omstruckOrderMaterialMapper.updateContinueStaus(orderId);
+        return result;
+    }
 }

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

@@ -582,9 +582,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
-        //if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4){
-        //    throw new Exception("钢材订单不允许撤销!");
-        //}
+        if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4){
+            throw new Exception("钢材订单不允许撤销!");
+        }
         if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
             throw new Exception("撤单失败");
         }

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

@@ -584,7 +584,9 @@
                                    RAR1.RAILWAY_BUREAU                              "railwayBureau",
                                    OTO.STRAWMATS                                    "strawMats",
                                    OO.ORDER_NUMBER                                  "number",
-                                   OTO.WAREHOUSE_ID                                 "unloadPointId"
+                                   OTO.WAREHOUSE_ID                                 "unloadPointId",
+                                   decode(OTO."IS_ACCEPT",0,'未收货',1,'已收货')      "isAccept",
+                                   OTO.is_accept_time                               "isAcceptTime"
                    FROM AMS_SALE_ORDER ASO
                           LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
                           LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID

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

@@ -2039,6 +2039,7 @@
         FROM AMS_SALE_ORDER_MATERIAL ASOM
         LEFT JOIN OMSTRUCK_ORDER OO
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        AND NVL(OO.ORDER_TYPE,0) BETWEEN 0 AND 1
         LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM

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

@@ -575,6 +575,11 @@
         WHERE OO.ORDER_ID = #{orderId}
     </update>
 
+  <update id="updateContinueStaus">
+    update OMSTRUCK_ORDER OO
+    set OO.CAN_WORK=null
+    WHERE OO.ORDER_ID = #{orderId}
+  </update>
     <select id="findDownMaterial" parameterType="DECIMAL" resultType="java.util.Map" >
     SELECT ASO.SALE_NUMBER      "number",
            ASM.EAS_PRIMARY_ID   "changeEntryId",