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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

拆单数据判断赋值

Browse Source
This commit is contained in:
lym
2024-12-06 15:44:17 +08:00
parent 4faa7eeae9
commit 36875fd1db
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+12 -3
View File
@@ -829,6 +829,8 @@ public class ApiTypeRealize {
.setRemarkJsonDei(remarkJson); .setRemarkJsonDei(remarkJson);
plateInfo.setHoleFace(plateDetailInfo.getTypographicFace()) plateInfo.setHoleFace(plateDetailInfo.getTypographicFace())
.setWidth(BigDecimal.valueOf(plateDetailInfo.getWidth()))
.setHeight(BigDecimal.valueOf(plateDetailInfo.getHeight()))
.setOffsetX(plateDetailInfo.getOffsetX()) .setOffsetX(plateDetailInfo.getOffsetX())
.setOffsetY(plateDetailInfo.getOffsetY()); .setOffsetY(plateDetailInfo.getOffsetY());
@@ -860,15 +862,22 @@ public class ApiTypeRealize {
Long blockNo = plate.getLong(ProduceApiConstants.BD_BLOCK_NO); Long blockNo = plate.getLong(ProduceApiConstants.BD_BLOCK_NO);
if (plateMap.get(blockNo) != null) { if (plateMap.get(blockNo) != null) {
JSONObject jsonObject = plateMap.get(blockNo); JSONObject jsonObject = plateMap.get(blockNo);
plateInfo.setHeight(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_HEIGHT))) plateInfo.setThickness(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_THICKNESS)))
.setWidth(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_WIDTH)))
.setThickness(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_THICKNESS)))
.setArea(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_AREA))) .setArea(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_AREA)))
.setTexture(jsonObject.getInteger(ProduceApiConstants.BG_WAVE)) .setTexture(jsonObject.getInteger(ProduceApiConstants.BG_WAVE))
.setIsRowHole(jsonObject.getBoolean(ProduceApiConstants.BG_IS_HOLE)); .setIsRowHole(jsonObject.getBoolean(ProduceApiConstants.BG_IS_HOLE));
} }
} }
BigDecimal splitHeight = plateInfo.getSplitHeight();
BigDecimal splitWidth = plateInfo.getSplitWidth();
BigDecimal splitThickness = plateInfo.getSplitThickness();
if (BigDecimal.ZERO.compareTo(splitHeight) == 0 || BigDecimal.ZERO.compareTo(splitWidth) == 0 || BigDecimal.ZERO.compareTo(splitThickness) == 0) {
plateInfo.setSplitHeight(plateInfo.getHeight())
.setSplitWidth(plateInfo.getWidth())
.setSplitThickness(plateInfo.getThickness());
}
platesInfos.put(plate.getLong(ProduceApiConstants.BD_ITEM_ID), plateInfo); platesInfos.put(plate.getLong(ProduceApiConstants.BD_ITEM_ID), plateInfo);
platesItem.put(plate.getLong(ProduceApiConstants.BD_ITEM_ID), itemPlate); platesItem.put(plate.getLong(ProduceApiConstants.BD_ITEM_ID), itemPlate);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
+1 -1
View File
@@ -235,7 +235,7 @@
WHERE WHERE
i.order_id = #{orderId} AND i.organ_id = #{organId} AND p.deleted = #{deleted} i.order_id = #{orderId} AND i.organ_id = #{organId} AND p.deleted = #{deleted}
GROUP BY GROUP BY
i.room_id, i.body_id, p.goods_id, g.goods_name i.order_id, i.room_id, i.body_id, p.goods_id, g.goods_name
</select> </select>