wms 收货详情-条码打印

mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java

@@ -44,6 +44,7 @@ import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.todo.NoReceiptOrderDO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO;
 import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainService;
+import com.mhd.wms.interfaces.dto.stockReceiptOrder.StockReceiptOrderDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2829,4 +2830,8 @@ public class StockReceiptOrderApplicationService {
         receiptMaterialDetailDO.setDistributeRuleCode(materialGoodsRulePO.getRuleCode());
         receiptMaterialDetailDO.setDistributeRuleName(materialGoodsRulePO.getRuleName());
     }
+
+    public List<StockReceiptOrderPO> queryPrintInfo(StockReceiptOrderDTO stockReceiptOrderDTO) {
+        return stockReceiptOrderDomainService.queryPrintInfo(stockReceiptOrderDTO);
+    }
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/facade/IStockReceiptOrderService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.mhd.wms.domain.stockReceiptOrder.entity.StockReceiptOrder;
 import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO;
+import com.mhd.wms.interfaces.dto.stockReceiptOrder.StockReceiptOrderDTO;
 
 import java.util.List;
 
@@ -40,4 +41,6 @@ public interface IStockReceiptOrderService extends IService<StockReceiptOrder>
      * 查询收货单
      */
     public StockReceiptOrderPO getInfo(Long receiptOrderId);
+
+    List<StockReceiptOrderPO> queryPrintInfo(StockReceiptOrderDTO stockReceiptOrderDTO);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/mapper/StockReceiptOrderMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mhd.wms.domain.stockReceiptOrder.entity.StockReceiptOrder;
 import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO;
+import com.mhd.wms.interfaces.dto.stockReceiptOrder.StockReceiptOrderDTO;
 
 import java.util.List;
 
@@ -20,4 +21,10 @@ public interface StockReceiptOrderMapper extends BaseMapper<StockReceiptOrder>
      */
     public List<StockReceiptOrderPO> queryList(StockReceiptOrderDO stockReceiptOrderDO);
 
+    /**
+     *
+     * @param stockReceiptOrderDTO
+     * @return
+     */
+    List<StockReceiptOrderPO> queryPrintInfo(StockReceiptOrderDTO stockReceiptOrderDTO);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/persistence/StockReceiptOrderImpl.java

@@ -12,6 +12,7 @@ import com.mhd.wms.domain.stockReceiptOrder.repository.facade.IStockReceiptOrder
 import com.mhd.wms.domain.stockReceiptOrder.repository.mapper.StockReceiptOrderMapper;
 import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO;
+import com.mhd.wms.interfaces.dto.stockReceiptOrder.StockReceiptOrderDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -117,4 +119,13 @@ public class StockReceiptOrderImpl extends ServiceImpl<StockReceiptOrderMapper,
                 .set(StockReceiptOrder::getUpdateTime, new Date())
                 .eq(StockReceiptOrder::getReceiptOrderNumber, deliveTaskDO.getTrackingNumber()));
     }
+
+
+
+    @Override
+    public List<StockReceiptOrderPO> queryPrintInfo(StockReceiptOrderDTO stockReceiptOrderDTO) {
+        return stockReceiptOrderMapper.queryPrintInfo(stockReceiptOrderDTO);
+    }
+
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java

@@ -159,4 +159,25 @@ public class StockReceiptOrderPO extends StockInOrderBasePO {
     private BigDecimal totalArea;
     @ApiModelProperty("费用")
     List<ReceiptOrderAccount> receiptOrderAccountList;
+
+    @ApiModelProperty("是否抄码: 1-否 2-是")
+    private Integer copyCode;
+
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("净重")
+    private BigDecimal netWeight;
+
+    @ApiModelProperty("毛重")
+    private BigDecimal grossWeight;
+
+    @ApiModelProperty("托盘号")
+    private String boxPalletNo;
+
+        @ApiModelProperty("序号")
+    private String serialNumber;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java

@@ -68,6 +68,7 @@ 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.domain.taskReceiptMaterialDetail.repository.todo.TaskReceiptMaterialDetailDO;
+import com.mhd.wms.interfaces.dto.stockReceiptOrder.StockReceiptOrderDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1887,4 +1888,7 @@ public class StockReceiptOrderDomainService {
         }
     }
 
+    public List<StockReceiptOrderPO> queryPrintInfo(StockReceiptOrderDTO stockReceiptOrderDTO) {
+        return stockReceiptOrderService.queryPrintInfo(stockReceiptOrderDTO);
+    }
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockReceiptOrder/StockReceiptOrderApi.java

@@ -104,4 +104,11 @@ public class StockReceiptOrderApi extends BaseController {
         return toAjax(stockReceiptOrderApplicationService.entireReceipt(receiptOrderIds));
     }
 
+    @ApiOperation("条码打印查询")
+    @PostMapping("/queryPrintInfo")
+    public AjaxResult queryPrintInfo(@RequestBody StockReceiptOrderDTO stockReceiptOrderDTO) {
+        List<StockReceiptOrderPO> list = stockReceiptOrderApplicationService.queryPrintInfo(stockReceiptOrderDTO);
+        return AjaxResult.success(list);
+    }
+
 }

mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml

@@ -35,6 +35,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="copyCode"                column="copy_code"/>
+        <result property="batchNumber"              column="batch_number"/>
+        <result property="materialCode"             column="material_code"/>
+        <result property="netWeight"                column="netWeight"/>
+        <result property="grossWeight"              column="grossWeight"/>
+        <result property="boxPalletNo"              column="boxPalletNo"/>
+        <result property="serialNumber"             column="serial_number"/>
     </resultMap>
 
 
@@ -148,4 +155,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ORDER BY a.create_time DESC
     </select>
+
+
+    <select id="queryPrintInfo" resultMap="StockReceiptOrderResult">
+        SELECT
+            a.batch_number,
+            ifnull(a.material_code, c.material_code) AS material_code,
+            c.copy_code,
+            ifnull(a.total_net_weight, b.total_net_weight) AS netWeight,
+            ifnull(a.total_gross_weight, b.total_gross_weight) AS grossWeight,
+            ifnull(a.box_pallet_no, b.box_pallet_no) AS boxPalletNo,
+            ims.serial_number
+        FROM receipt_material_detail a
+                 LEFT JOIN stock_receipt_order sro ON a.receipt_order_number = sro.receipt_order_number AND sro.del_flag = 1
+                 LEFT JOIN in_material_detail b ON a.in_unique_id = b.unique_id AND b.del_flag = 1
+                 LEFT JOIN material_base_info c ON a.material_base_info_id = c.material_base_info_id AND c.del_flag = 1
+                 LEFT JOIN in_material_detail_serial_number ims ON a.material_detail_id = ims.material_detail_unique_id AND ims.del_flag = 1
+        WHERE sro.receipt_order_number = #{receiptOrderNumber}
+          AND a.del_flag = 1
+
+    </select>
+
+
 </mapper>