投产修改

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

@@ -60,7 +60,7 @@ public class ProduceOrderController {
      */
     @PostMapping("/putProduction")
     void putProduction(@RequestBody ProduceOrderSelectDto dto) {
-        produceOrderService.putProduction(dto.getId());
+        produceOrderService.putProduction(dto);
     }
 
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderSelectDto.java

@@ -43,4 +43,9 @@ public class ProduceOrderSelectDto extends BaseSelectDto {
 	 */
 	private Long companyId;
 
+	/**
+	 * 投产时间
+	 */
+	private Date produceTime;
+
 }

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

@@ -38,5 +38,5 @@ public interface ProduceOrderService extends BaseService<ProductionOrder> {
     /**
      * 投产
      */
-    void putProduction(Long id);
+    void putProduction(ProduceOrderSelectDto dto);
 }

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

@@ -197,8 +197,14 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
      */
     @Override
     @DSTransactional
-    public synchronized void putProduction(Long id) {
-        ProductionOrder productionOrder = this.getById(id);
+    public synchronized void putProduction(ProduceOrderSelectDto dto) {
+        Long orderId = dto.getId();
+        Date produceTime = dto.getProduceTime();
+
+        Assert.notEmpty(orderId, "投产id不能为空！");
+        Assert.notEmpty(produceTime, "投产时间不能为空！");
+
+        ProductionOrder productionOrder = this.getById(orderId);
         Assert.notEmpty(productionOrder, "查询不到订单信息！");
 
         if (ObjectUtil.isNotEmpty(productionOrder.getProduceTime())) {
@@ -209,7 +215,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         createMaterialPreparation(productionOrder);
 
         productionOrder.setProduceStatus(1);
-        productionOrder.setProduceTime(new Date());
+        productionOrder.setProduceTime(produceTime);
 
         this.updateById(productionOrder);
     }