生产任务查看，采购，流水

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

@@ -5,6 +5,7 @@ import com.fjhx.mes.entity.production.dto.ProduceOrderSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionOrderDto;
 import com.fjhx.mes.entity.production.vo.ProductionOrderVo;
 import com.fjhx.mes.service.production.ProduceOrderService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -86,4 +87,12 @@ public class ProduceOrderController {
     public void editDeliveryPeriod(@RequestBody ProductionOrderDto dto) {
         produceOrderService.editDeliveryPeriod(dto);
     }
+
+    /**
+     * 生产订单明细
+     */
+    @PostMapping("/detail")
+    public ProductionOrderVo detail(@RequestBody BaseSelectDto dto) {
+        return produceOrderService.detail(dto.getId());
+    }
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderVo.java

@@ -1,6 +1,8 @@
 package com.fjhx.mes.entity.production.vo;
 
 import com.fjhx.mes.entity.production.po.ProductionOrder;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
+import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -27,7 +29,6 @@ public class ProductionOrderVo extends ProductionOrder {
      * 生产指示
      */
     private String prodTag;
-
     /**
      * 归属公司名称
      */
@@ -43,4 +44,12 @@ public class ProductionOrderVo extends ProductionOrder {
      */
     private String prodRemark;
 
+    List<EhsdPurchaseProductVo> purchaseProductList;
+    List<StockJournalDetailsVo> stockJournalDetailsList;
+
+    /**
+     * 确认状态
+     */
+    private Integer confirmStatus;
+
 }

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

@@ -56,4 +56,6 @@ public interface ProduceOrderService extends BaseService<ProductionOrder> {
      * @param dto
      */
     void editDeliveryPeriod(ProductionOrderDto dto);
+
+    ProductionOrderVo detail(Long id);
 }

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

@@ -33,12 +33,18 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProductBom;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
+import com.fjhx.sale.mapper.purchase.EhsdPurchaseProductMapper;
 import com.fjhx.sale.service.contract.ContractProductBomService;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.socket.core.PushTypeEnum;
 import com.fjhx.socket.core.WebSocketPush;
 import com.fjhx.tenant.utils.DeptUstil;
+import com.fjhx.wms.entity.stock.po.StockJournalDetails;
+import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
+import com.fjhx.wms.mapper.stock.StockJournalDetailsMapper;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
@@ -88,6 +94,10 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
     private ContractProductBomService contractProductBomService;
     @Autowired
     private SubscribeDetailService subscribeDetailService;
+    @Autowired
+    private EhsdPurchaseProductMapper ehsdPurchaseProductMapper;
+    @Autowired
+    private StockJournalDetailsMapper stockJournalDetailsMapper;
 
     @Override
     public Page<ProductionOrderVo> getPage(ProduceOrderSelectDto dto) {
@@ -233,6 +243,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         Assert.notEmpty(produceCompany, "查询不到生产公司信息");
         Long companyId = produceCompany.getDeptId();
         produceOrderDto.setCompanyId(companyId);
+        produceOrderDto.setConfirmStatus(0);
 
         //获取合同信息
         Contract contract = contractService.getById(contractId);
@@ -465,8 +476,10 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         produceOrderDetailService.updateBatchById(productionOrderDetailList);
     }
 
+    @DSTransactional
     @Override
     public void deliveryConfirm(ProductionOrderDto dto) {
+        this.updateById(dto);
         Long id = dto.getId();
         ProductionOrder productionOrder = this.getById(id);
         Assert.notEmpty(productionOrder, "查询不到订单信息！");
@@ -507,4 +520,44 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         );
     }
 
+    @Override
+    public ProductionOrderVo detail(Long id) {
+        ProductionOrder productionOrder = this.getById(id);
+        ProductionOrderVo productionOrderVo = BeanUtil.copyProperties(productionOrder, ProductionOrderVo.class);
+
+        List<EhsdPurchaseProductVo> ehsdPurchaseProductVos = ehsdPurchaseProductMapper.getList(IWrapper.<EhsdPurchaseProduct>getWrapper()
+                .eq("epp", EhsdPurchaseProduct::getContractId, productionOrder.getContractId())
+        );
+        //赋值产品信息
+        productInfoService.attributeAssign(ehsdPurchaseProductVos, EhsdPurchaseProductVo::getProductId, (detail, product) -> {
+            detail.setProductCode(product.getCustomCode());
+            detail.setProductName(product.getName());
+            detail.setProductSpec(product.getSpec());
+            detail.setProductLength(product.getLength());
+            detail.setProductWidth(product.getWidth());
+            detail.setProductHeight(product.getHeight());
+            detail.setProductColor(product.getColor());
+        });
+
+        List<StockJournalDetailsVo> stockJournalDetailsVos = stockJournalDetailsMapper.getList(IWrapper.<StockJournalDetails>getWrapper()
+                .eq("sj", StockJournalDetails::getContractId, productionOrder.getContractId())
+        );
+        //赋值产品信息
+        productInfoService.attributeAssign(stockJournalDetailsVos, StockJournalDetailsVo::getProductId, (detail, product) -> {
+            detail.setProductCode(product.getCustomCode());
+            detail.setProductName(product.getName());
+            detail.setProductUnit(product.getUnit());
+            detail.setProductSpec(product.getSpec());
+            detail.setProductLength(product.getLength());
+            detail.setProductWidth(product.getWidth());
+            detail.setProductHeight(product.getHeight());
+            detail.setProductColor(product.getColor());
+        });
+
+        productionOrderVo.setPurchaseProductList(ehsdPurchaseProductVos);
+        productionOrderVo.setStockJournalDetailsList(stockJournalDetailsVos);
+
+        return productionOrderVo;
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/arrival/po/Arrival.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.entity.arrival.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;
@@ -33,6 +34,7 @@ public class Arrival extends BasePo {
     /**
      * 到货时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date arrivalTime;
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchaseProduct.java

@@ -15,7 +15,7 @@ import java.util.List;
  * ehsd采购产品表
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-17
  */
 @Getter
@@ -106,4 +106,9 @@ public class EhsdPurchaseProduct extends BasePo {
     private BigDecimal exceedQuantity;
 
     private BigDecimal arrivalQuantity;
+
+    /**
+     * 合同id
+     */
+    private Long contractId;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseProductVo.java

@@ -84,4 +84,6 @@ public class EhsdPurchaseProductVo extends EhsdPurchaseProduct {
      * 销售订单号
      */
     private String saleCode;
+
+    private String productColor;
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/purchase/EhsdPurchaseProductMapper.java

@@ -57,5 +57,7 @@ public interface EhsdPurchaseProductMapper extends BaseMapper<EhsdPurchaseProduc
 
     BigDecimal getPurchaseQuantitySumBySubscribeDetailId(Long subscribeDetailId);
 
+    List<EhsdPurchaseProductVo> getList(@Param("ew") IWrapper<EhsdPurchaseProduct> wrapper);
+
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/impl/ArrivalServiceImpl.java

@@ -113,6 +113,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         stockWait.setBusinessCode(purchase.getCode());
         stockWait.setStatus(0);
         stockWait.setPurchaseId(purchase.getId());
+        stockWait.setContractId(purchase.getDataResourceId());
         stockWaitService.save(stockWait);
         List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
 

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProductMapper.xml

@@ -107,4 +107,12 @@
           AND epp.subscribe_detailId = #{subscribeDetailId}
         GROUP BY epp.product_id
     </select>
+    <select id="getList" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo">
+        SELECT ep.`code` AS purchaseCode,
+               ep.create_time,
+               epp.*
+        FROM ehsd_purchase_product epp
+                 LEFT JOIN ehsd_purchase ep ON epp.purchase_id = ep.id
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockJournal.java

@@ -90,4 +90,14 @@ public class StockJournal extends BasePo {
      */
     private String exWarehousePerson;
 
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 采购id
+     */
+    private Long purchaseId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockJournalDetails.java

@@ -58,4 +58,14 @@ public class StockJournalDetails extends BasePo {
      */
     private Long companyId;
 
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 采购id
+     */
+    private Long purchaseId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalDetailsVo.java

@@ -135,4 +135,8 @@ public class StockJournalDetailsVo extends StockJournalDetails {
     private BigDecimal productLength;
     private BigDecimal productWidth;
     private BigDecimal productHeight;
+
+    private String productColor;
+
+
 }

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockJournalDetailsMapper.java

@@ -1,20 +1,21 @@
 package com.fjhx.wms.mapper.stock;
 
-import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
-import com.fjhx.wms.entity.stock.vo.StockJournalVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
  * 出入库记录明细 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-20
  */
 public interface StockJournalDetailsMapper extends BaseMapper<StockJournalDetails> {
@@ -24,4 +25,6 @@ public interface StockJournalDetailsMapper extends BaseMapper<StockJournalDetail
      */
     Page<StockJournalDetailsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<StockJournalDetails> wrapper);
 
+    List<StockJournalDetailsVo> getList(@Param("ew") IWrapper<StockJournalDetails> wrapper);
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -158,6 +158,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockJournal.setWarehouseId(warehouseId);
         stockJournal.setBusinessId(stockWaitDto.getId());
         stockJournal.setCompanyId(companyId);
+        stockJournal.setContractId(stockWait.getContractId());
+        stockJournal.setPurchaseId(stockWait.getPurchaseId());
         //保存出入库记录
         stockJournalService.save(stockJournal);
 
@@ -179,6 +181,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             stockJournalDetails.setQuantity(stock.getQuantity());
             stockJournalDetails.setBusinessDetailsId(waitDetails.getId());
             stockJournalDetails.setCompanyId(companyId);
+            stockJournalDetails.setContractId(stockJournal.getContractId());
+            stockJournalDetails.setPurchaseId(stockJournal.getPurchaseId());
             stockJournalDetailsList.add(stockJournalDetails);
         }
         List<InOutBo> inOutBoList = BeanUtil.copyToList(stockList, InOutBo.class);

hx-wms/src/main/resources/mapper/stock/StockJournalDetailsMapper.xml

@@ -26,4 +26,13 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getList" resultType="com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo">
+        SELECT sj.op_type,
+               sj.type,
+               sjd.*
+        FROM stock_journal_details sjd
+                 LEFT JOIN stock_journal sj ON sjd.stock_journal_id = sj.id
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>