待入库功能修改

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
@@ -234,6 +235,7 @@ public class Contract extends BasePo {
     /**
      * 交期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date deliveryTime;
 
     /**
@@ -509,6 +511,7 @@ public class Contract extends BasePo {
     /**
      * 销售日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date saleDate;
     /**
      * 税运方式（字典 tax_transportation_way）

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDto.java

@@ -1,11 +1,13 @@
 package com.fjhx.wms.entity.stock.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fjhx.file.entity.ObsFile;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -63,4 +65,7 @@ public class StockWaitDto extends StockWait {
      */
     private List<ObsFile> fileList;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date inOutTime;
+
 }

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

@@ -1,6 +1,7 @@
 package com.fjhx.wms.entity.stock.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;
@@ -100,4 +101,7 @@ public class StockJournal extends BasePo {
      */
     private Long purchaseId;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date inOutTime;
+
 }

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

@@ -86,4 +86,17 @@ public class StockWaitDetailsVo extends StockWaitDetails {
      */
     private BigDecimal availableQuantity;
 
+    /**
+     * 净重
+     */
+    private BigDecimal productNetWeight;
+    /**
+     * 正面纹路
+     */
+    private String productFrontalTexture;
+    /**
+     * 反面纹路
+     */
+    private String productReverseTexture;
+
 }

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

@@ -22,4 +22,12 @@ public class StockWaitVo extends StockWait {
 
     private String companyName;
 
+    private Long purchaseUserId;
+    private String purchaseUserName;
+
+    private Long warehouseId;
+    private String warehouseName;
+
+    private Long inOutUserId;
+    private String inOutUserName;
 }

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

@@ -28,6 +28,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -124,6 +125,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             item.setProductType(productInfo.getType());
             item.setProductSpec(productInfo.getSpec());
             item.setProductDefinition(productInfo.getDefinition());
+
+            item.setProductNetWeight(productInfo.getNetWeight());
+            item.setProductFrontalTexture(productInfo.getFrontalTexture());
+            item.setProductReverseTexture(productInfo.getReverseTexture());
         });
 
         //赋值可用库存信息
@@ -148,6 +153,16 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         for (StockWaitVo record : records) {
             record.setCompanyName(companyMap.get(record.getCompanyId()));
         }
+
+        //赋值采购员信息
+        UserUtil.assignmentNickName(records, StockWaitVo::getPurchaseUserId, StockWaitVo::setPurchaseUserName);
+        //赋值入库仓库信息
+        warehouseService.attributeAssign(records, StockWaitVo::getWarehouseId, (item, warehouse) -> {
+            item.setWarehouseName(warehouse.getName());
+        });
+        //赋值入库员名称
+        UserUtil.assignmentNickName(records, StockWaitVo::getInOutUserId, StockWaitVo::setInOutUserName);
+
     }
 
     @Override
@@ -204,6 +219,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockJournal.setCompanyId(companyId);
         stockJournal.setContractId(stockWait.getContractId());
         stockJournal.setPurchaseId(stockWait.getPurchaseId());
+        //------------------------------------------------------------
+        stockJournal.setInOutTime(stockWaitDto.getInOutTime());
         //保存出入库记录
         stockJournalService.save(stockJournal);
 

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

@@ -25,20 +25,24 @@
     </select>
 
     <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockWaitVo">
-        SELECT
-            sw.id,
-            sw.type,
-            sw.business_id,
-            sw.business_code,
-            sw.business_type,
-            sw.`status`,
-            sw.create_user,
-            sw.create_time,
-            sw.update_user,
-            sw.update_time,
-            sw.company_id
-        FROM
-            stock_wait sw
+        SELECT sw.id,
+               sw.type,
+               sw.business_id,
+               sw.business_code,
+               sw.business_type,
+               sw.`status`,
+               sw.create_user,
+               sw.create_time,
+               sw.update_user,
+               sw.update_time,
+               sw.company_id,
+               (SELECT p.purchase_user_id FROM ehsd_purchase p WHERE p.id = sw.purchase_id) as purchaseUserId,
+               (SELECT p.warehouse_id FROM ehsd_purchase p WHERE p.id = sw.purchase_id)     as warehouseId,
+               (SELECT w.keeper_id
+                FROM ehsd_purchase p
+                         JOIN warehouse w ON p.warehouse_id = w.id
+                WHERE p.id = sw.purchase_id)                                                as inOutUserId
+        FROM stock_wait sw
             ${ew.customSqlSegment}
     </select>