Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 05:12:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

板材、余料字段检验

Browse Source
This commit is contained in:
lym
2024-10-15 15:55:15 +08:00
parent 5090ce1807
commit 8b6232edbb
17 changed files with 269 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class ErrorCodeConstants {
// ========== 生产单 TODO 补充编号 ==========
public static final ErrorCode ORDER_NOT_EXISTS = new ErrorCode(1_001_109_000, "生产单不存在");
public static final ErrorCode ORDER_NOT_CANCEL = new ErrorCode(1_001_109_000, "生产单已生产，无法作废");
public static final ErrorCode ORDER_NOT_CANCEL = new ErrorCode(1_001_109_000, "生产单以进入生产状态，无法作废");
public static final ErrorCode ORDER_PLAN_ERROR = new ErrorCode(1_001_109_001, "选中删除对象有已开料板件，请联系管理员修改开料状态后再删除！");
public static final ErrorCode ORDER_ERROR = new ErrorCode(1_001_109_002, "当前生产单柜体，房间已全部删除！");
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+1 -1
View File
@@ -1000,7 +1000,7 @@ public class ApiTypeRealize {
Map<String, String> map = new HashMap<>();
for (int i = 1; i < 6; i++) {
if (block.getString("Remark" + i) != null && !block.getString("Remark" + i).isEmpty()) {
map.put("remark" + i, block.getString("remark" + i));
map.put("Remark" + i, block.getString("Remark" + i));
}
}
return map;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+8 -8
View File
@@ -244,12 +244,12 @@
bdy.room_id,
bdy.room_name
from order_plate op
left join order_goods ogs on op.goods_id = ogs.id
left join order_item its on op.id = its.plate_id
left join order_body bdy on bdy.id = its.body_id
where op.order_id = #{orderId}
and op.organ_id = #{organId}
left join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
left join order_item its on op.organ_id = its.organ_id and op.order_id = its.order_id and op.id = its.plate_id
left join order_body bdy on its.organ_id = bdy.organ_id and its.order_id = bdy.order_id and its.body_id = bdy.id
where op.organ_id = #{organId}
and op.deleted = #{deleted}
and op.order_id = #{orderId}
</select>
<select id="selectPlateGoodsListSummary" resultType="com.cf.imes.module.executor.controller.admin.plate.vo.PlateGoodsRespVO">
@@ -271,9 +271,9 @@
bdy.room_id,
bdy.room_name
from order_plate op
left join order_goods ogs on op.goods_id = ogs.id
left join order_item its on op.id = its.plate_id
left join order_body bdy on bdy.id = its.body_id
left join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
left join order_item its on op.organ_id = its.organ_id and op.order_id = its.order_id and op.id = its.plate_id
left join order_body bdy on its.organ_id = bdy.organ_id and its.order_id = bdy.order_id and its.body_id = bdy.id
where op.order_id = #{orderId}
and op.organ_id = #{organId}
and op.deleted = #{deleted}