上线开工确认

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

@@ -49,7 +49,7 @@ public class ProduceOrderDetailController {
     /**
      * 生产任务详情
      */
-    @PostMapping("/detail")
+    @PostMapping(value = {"/detail", "/beginWorkDetail"})
     public ProductionOrderDetailVo detail(@RequestBody ProductionOrderDetailDto dto) {
         return produceOrderDetailService.detail(dto);
     }
@@ -83,4 +83,13 @@ public class ProduceOrderDetailController {
         produceOrderDetailService.reportLockOrUnlock(dto);
     }
 
+    /**
+     * 生产开工确认
+     */
+    @PostMapping("/editBeginWork")
+    public void editBeginWork(@RequestBody ProductionOrderDetailDto dto) {
+        produceOrderDetailService.editBeginWork(dto);
+    }
+
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionOrderDetail.java

@@ -1,6 +1,7 @@
 package com.fjhx.mes.entity.production.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -80,4 +81,37 @@ public class ProductionOrderDetail extends BasePo {
      */
     private Integer reportLock;
 
+    //==================开工确认==================
+    /**
+     * 开工确认-预计上线
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date expectBeginTime;
+    /**
+     * 开工确认-预计交货
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date expectDeliveryTime;
+    /**
+     * 开工确认-是否同意开工1同意0不同意
+     */
+    private Integer isAgreeWork;
+    /**
+     * 开工确认-走柜时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date cabinetExitTime;
+    /**
+     * 开工确认-走柜是否明确1明确0不明确
+     */
+    private Integer isCabinetConfirm;
+    /**
+     * 开工确认-其他说明
+     */
+    private String workRemark;
+    /**
+     * 开工确认-提交状态 0暂存 1提交
+     */
+    private Integer beginWorkStatus;
+
 }

hx-mes/src/main/java/com/fjhx/mes/mapper/production/ProduceOrderDetailMapper.java

@@ -28,6 +28,8 @@ public interface ProduceOrderDetailMapper extends BaseMapper<ProductionOrderDeta
      */
     Page<ProductionOrderDetailVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductionOrderDetail> wrapper);
 
+    List<ProductionOrderDetailVo> getPage(@Param("ew") IWrapper<ProductionOrderDetail> wrapper);
+
     Page<ProductionOrderDetailVo> schedulingTaskPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductionOrderDetail> wrapper);
 
     /**

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

@@ -55,4 +55,9 @@ public interface ProduceOrderDetailService extends BaseService<ProductionOrderDe
      * 报工锁定或解锁
      */
     void reportLockOrUnlock(ProduceOrderDetailSelectDto dto);
+
+    /**
+     * 生产开工确认
+     */
+    void editBeginWork(ProductionOrderDetailDto dto);
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.utils.Assert;
@@ -315,8 +316,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     public List<ProductionOrderDetailVo> detailByIds(List<Long> taskIds) {
         Assert.notEmpty(taskIds, "任务id列表不能为空");
 
-        List<ProductionOrderDetail> productionOrderDetailList = this.list(q -> q.in(ProductionOrderDetail::getId, taskIds));
-        List<ProductionOrderDetailVo> voList = BeanUtil.copyToList(productionOrderDetailList, ProductionOrderDetailVo.class);
+        List<ProductionOrderDetailVo> voList = baseMapper.getPage(getWrapper().in("pod", ProductionOrderDetail::getId, taskIds));
 
         //赋值订单信息
         produceOrderService.attributeAssign(voList, ProductionOrderDetailVo::getProduceOrderId, (detail, order) -> {
@@ -396,6 +396,14 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
             detail.setProductionTaskProgressList(ptpMap.get(detail.getId()));
         }
 
+        //赋值业务员名称
+        UserUtil.assignmentNickName(voList, ProductionOrderDetailVo::getSaleUserId, ProductionOrderDetailVo::setSaleUserName);
+
+        //赋值客户名称
+        customerService.attributeAssign(voList, ProductionOrderDetailVo::getCustomerId, (item, customer) -> {
+            item.setCustomerName(customer.getName());
+        });
+
         return voList;
     }
 
@@ -451,4 +459,10 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         );
     }
 
+    @DSTransactional
+    @Override
+    public void editBeginWork(ProductionOrderDetailDto dto) {
+        this.updateById(dto);
+    }
+
 }

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -235,10 +235,10 @@
 
     <select id="detail" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
         SELECT cp.*,
-               c.place_order_type,
-               c.create_time   AS contractCreateTime,
-               c.`code`        AS contractCode,
-               c.delivery_time AS contractDeliveryTime,
+               c.place_order_type AS contractPlaceOrderType,
+               c.create_time      AS contractCreateTime,
+               c.`code`           AS contractCode,
+               c.delivery_time    AS contractDeliveryTime,
                c.salesman_id,
                su.nick_name    AS salesmanName,
                c.quality_lv    AS contractQualityLv,