Parcourir la source

添加投产功能

yzc il y a 1 an
Parent
commit
e77260007a

+ 8 - 0
hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderController.java

@@ -55,4 +55,12 @@ public class ProduceOrderController {
         return produceOrderService.getSchedulingList(produceOrderDto);
     }
 
+    /**
+     * 投产
+     */
+    @PostMapping("/putProduction")
+    void putProduction(@RequestBody ProduceOrderSelectDto dto) {
+        produceOrderService.putProduction(dto.getId());
+    }
+
 }

+ 5 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionOrder.java

@@ -54,4 +54,9 @@ public class ProductionOrder extends BasePo {
      */
     private Long companyId;
 
+    /**
+     * 投产时间
+     */
+    private Date produceTime;
+
 }

+ 5 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderDetailVo.java

@@ -107,4 +107,9 @@ public class ProductionOrderDetailVo extends ProductionOrderDetail {
 	 */
 	private List<ContractProductBomVo> contractProductBomList;
 
+	/**
+	 * 投产时间
+	 */
+	private Date produceTime;
+
 }

+ 4 - 0
hx-mes/src/main/java/com/fjhx/mes/service/production/ProduceOrderService.java

@@ -35,4 +35,8 @@ public interface ProduceOrderService extends BaseService<ProductionOrder> {
      */
     List<ProductionOrderVo> getSchedulingList(ProduceOrderSelectDto dto);
 
+    /**
+     * 投产
+     */
+    void putProduction(Long id);
 }

+ 14 - 0
hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -270,4 +270,18 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         productionTaskProgressService.saveBatch(productionTaskProgressList);
     }
 
+    /**
+     * 投产
+     */
+    @Override
+    public void putProduction(Long id) {
+        Date date = new Date();
+        this.update(q -> q
+                .eq(ProductionOrder::getId, id)
+                .set(ProductionOrder::getProduceTime, date)
+                .set(ProductionOrder::getUpdateTime, date)
+                .set(ProductionOrder::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
 }

+ 2 - 1
hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -20,7 +20,8 @@
 			   pod.del_flag,
 			   po.code        AS orderCode,
 			   po.create_time AS orderCreateTime,
-			   po.delivery_period
+			   po.produce_time
+			po.delivery_period
 		FROM production_order_detail pod
 				 LEFT JOIN production_order po ON pod.produce_order_id = po.id
 			${ew.customSqlSegment}

+ 1 - 0
hx-mes/src/main/resources/mapper/production/ProduceOrderMapper.xml

@@ -5,6 +5,7 @@
 		select po.id,
 			   po.contract_id,
 			   po.code,
+			   po.produce_time,
 			   po.delivery_period,
 			   po.produce_status,
 			   po.create_user,