wms 入库管理-打印入库单

mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java

@@ -28,6 +28,7 @@ import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
 import com.mhd.wms.domain.stockInOrder.service.StockInOrderDomainService;
+import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
 import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderImportRowDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
@@ -1878,4 +1879,7 @@ public class StockInOrderApplicationService {
         }
     }
 
+    public List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderDomainService.queryInStockInfoByInOrderNumber(stockInOrderDTO);
+    }
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/facade/IStockInOrderService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
+import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
 
 import java.util.List;
 
@@ -40,4 +41,6 @@ public interface IStockInOrderService extends IService<StockInOrder>
      * 查询入库单
      */
     public StockInOrderPO getInfo(Long inOrderId);
+
+    List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/mapper/StockInOrderMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
+import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
 
 import java.util.List;
 
@@ -20,4 +21,5 @@ public interface StockInOrderMapper extends BaseMapper<StockInOrder>
      */
     public List<StockInOrderPO> queryList(StockInOrderDO stockInOrderDO);
 
+    List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/persistence/StockInOrderImpl.java

@@ -6,12 +6,14 @@ import com.mhd.wms.domain.stockInOrder.repository.facade.IStockInOrderService;
 import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
+import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -81,4 +83,9 @@ public class StockInOrderImpl extends ServiceImpl<StockInOrderMapper, StockInOrd
         BeanUtils.copyProperties(stockInOrder,stockInOrderPO);
         return stockInOrderPO;
     }
+
+    @Override
+    public List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderMapper.queryInStockInfoByInOrderNumber(stockInOrderDTO);
+    }
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java

@@ -373,4 +373,23 @@ public class StockInOrderPO extends BaseVOEntity {
     @ApiModelProperty("订单状态")
     @Excel(name = "订单状态")
     private String orderStatus;
+
+    @ApiModelProperty("批号")
+    private String batchNumber;
+
+    @ApiModelProperty("货号/物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("品名/物料名称")
+    private String materialName;
+
+    @ApiModelProperty("型号")
+    private String materialShape;
+
+    @ApiModelProperty("规格")
+    private String specificationModel;
+
+    @ApiModelProperty("状态名称")
+    private String statusName;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java

@@ -43,6 +43,7 @@ import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainServi
 import com.mhd.wms.domain.stockShelfOrder.repository.po.StockShelfOrderPO;
 import com.mhd.wms.domain.stockShelfOrder.repository.todo.StockShelfOrderDO;
 import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService;
+import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -835,4 +836,7 @@ public class StockInOrderDomainService {
         return camelCase.toString();
     }
 
+    public List<StockInOrderPO> queryInStockInfoByInOrderNumber(StockInOrderDTO stockInOrderDTO) {
+        return stockInOrderService.queryInStockInfoByInOrderNumber(stockInOrderDTO);
+    }
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java

@@ -150,4 +150,11 @@ public class StockInOrderApi extends BaseController {
         stockInOrderApplicationService.omsOrderAddDetail(inMaterialDetails);
     }
 
+    @ApiOperation("查询入库信息（通过入库单号）")
+    @PostMapping("/queryInStockInfo")
+    public AjaxResult queryInStockInfo(@RequestBody StockInOrderDTO stockInOrderDTO) {
+        List<StockInOrderPO> list = stockInOrderApplicationService.queryInStockInfoByInOrderNumber(stockInOrderDTO);
+        return AjaxResult.success(list);
+    }
+
 }

mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml

@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseDate"    column="WAREHOUSE_DATE"    />
         <result property="completionTime"    column="COMPLETION_TIME"    />
         <result property="orderDate"    column="ORDER_DATE"    />
+        <result property="batchNumber"    column="BATCH_NUMBER"    />
     </resultMap>
 
     <!-- 计划入库数量：入库明细主行 quantity 汇总（列表 quantity / plan_in_quantity 均以此为准展示） -->
@@ -432,4 +433,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ORDER BY a.create_time IS NULL, a.create_time DESC
     </select>
+
+    <select id="queryInStockInfoByInOrderNumber" resultMap="StockInOrderResult">
+        SELECT
+            sio.in_order_number,
+            sio.notice_number,
+            sio.order_type_name,
+            sio.create_time,
+            sio.manufacturer,
+            sio.warehouse_name,
+            CASE sio.status
+                WHEN 1 THEN '已创建'
+                WHEN 2 THEN '已审核'
+                WHEN 3 THEN '收货中'
+                WHEN 4 THEN '上架中'
+                WHEN 5 THEN '已入库'
+                ELSE ''
+                END AS statusName,
+            sio.remark,
+            imd.batch_number,
+            imd.material_code,
+            imd.material_name,
+            imd.quantity,
+            imd.shelves_quantity,
+
+            imd.specification_model
+        FROM stock_in_order sio
+        LEFT JOIN in_material_detail imd ON sio.in_order_number = imd.in_order_number AND imd.del_flag = 1
+        WHERE sio.in_order_number = #{inOrderNumber}
+          AND sio.del_flag = 1
+        ORDER BY imd.material_detail_id
+    </select>
+
 </mapper>