生产排程添加投产时间修改

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

@@ -59,8 +59,16 @@ public class ProduceOrderController {
      * 投产
      */
     @PostMapping("/putProduction")
-    void putProduction(@RequestBody ProduceOrderSelectDto dto) {
+    public void putProduction(@RequestBody ProduceOrderSelectDto dto) {
         produceOrderService.putProduction(dto);
     }
 
+    /**
+     * 投产
+     */
+    @PostMapping("/editProduceTime")
+    public void editProduceTime(@RequestBody ProduceOrderSelectDto dto) {
+        produceOrderService.editProduceTime(dto);
+    }
+
 }

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

@@ -46,6 +46,7 @@ public class ProduceOrderSelectDto extends BaseSelectDto {
 	/**
 	 * 投产时间
 	 */
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
 	private Date produceTime;
 
 }

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

@@ -39,4 +39,9 @@ public interface ProduceOrderService extends BaseService<ProductionOrder> {
      * 投产
      */
     void putProduction(ProduceOrderSelectDto dto);
+
+    /**
+     * 修改投产时间
+     */
+    void editProduceTime(ProduceOrderSelectDto dto);
 }

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

@@ -221,6 +221,25 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
     }
 
     /**
+     * 修改投产时间
+     */
+    @Override
+    public void editProduceTime(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, "查询不到订单信息！");
+
+        productionOrder.setProduceTime(produceTime);
+
+        this.updateById(productionOrder);
+    }
+
+    /**
      * 创建生产任务
      */
     private synchronized void createOrderDetails(ProductionOrder produceOrder) {

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

@@ -16,24 +16,17 @@
 			${ew.customSqlSegment}
 	</select>
 	<select id="getSchedulingList" resultType="com.fjhx.mes.entity.production.vo.ProductionOrderVo">
-		SELECT
-		po.`code`,
-		GROUP_CONCAT( pi.`name` ) AS productName,
-		po.create_time,
-		po.delivery_period
+		SELECT po.id,
+			   po.`code`,
+			   GROUP_CONCAT( pi.`name` ) AS productName,
+			   po.create_time,
+			   po.produce_time,
+			   po.delivery_period
 		FROM
 		production_order po
 		LEFT JOIN production_order_detail pod ON pod.produce_order_id = po.id
 		LEFT JOIN product_info pi ON pod.product_id = pi.id
 		${ew.customSqlSegment}
-		<!--		WHERE-->
-		<!--		(-->
-		<!--			DATE_FORMAT( po.create_time, '%Y-%m' ) = '2024-01'-->
-		<!--			OR DATE_FORMAT( po.delivery_period, '%Y-%m' ) = '2024-01'-->
-		<!--			OR ( DATE_FORMAT( po.create_time, '%Y-%m' ) <= '2024-01' AND DATE_FORMAT( po.delivery_period, '%Y-%m' )>= '2024-01' )-->
-		<!--		)-->
-		<!--		GROUP BY-->
-		<!--		po.id-->
 	</select>
 
 </mapper>