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/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/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",