laoyao 3 anni fa
parent
commit
98bc023c28

+ 1 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -146,6 +146,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
                 OrderProduct item = new OrderProduct();
                 item.setOrderId(order.getId());
                 item.setOrderNo(order.getOrderNo());
+                item.setFurnaceBatchNo(map.get("furnaceBatchNo").toString());
                 item.setBomId(Long.parseLong(map.get("bomId").toString()));
                 item.setBomNum(Integer.parseInt(map.get("bomNum").toString()));
                 productNum+=item.getBomNum();

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderProductMapper.xml

@@ -57,7 +57,7 @@
 
     <select id="getList" parameterType="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct" resultType="com.github.zuihou.business.operationManagementCenter.entity.OrderProduct">
         select a.*,b.name,b.no as bomNo,b.specifications as specifications,b.model,b.brand,ifnull(c.planNum,0) as planNum,
-        b.parts_no partsNo,b.parts_alias partsAlias,b.bom_alias bomAlias,b.name bomName,
+        b.parts_no partsNo,b.parts_alias partsAlias,b.bom_alias bomAlias,b.name bomName,b.meterial_id meterialId,a.furnace_batch_no furnaceBatchNo,
         (ifnull(a.bom_num,0)-ifnull(c.planNum,0)) as stayPlanNum,d.delivery_time as orderDeliveryTime from imcs_o_order_product a
         left join imcs_b_bom b on a.bom_id = b.id
         left join (

+ 5 - 0
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/OrderProduct.java

@@ -218,6 +218,11 @@ public class OrderProduct extends Entity<Long> {
     @Excel(name = "产品代号")
     private String bomAlias;
 
+    @ApiModelProperty(value = "原材料id")
+    @TableField(exist = false)
+    @Excel(name = "原材料id")
+    private Long meterialId;
+
 
 
     @Builder