nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java

@@ -300,6 +300,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 导出物料标签图片ZIP
+     *
      * @param id 订单ID
      */
     @GetMapping(value = "exportItemImageZip", produces = "application/zip")
@@ -335,6 +336,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 导出报工单PDF（单个）
+     *
      * @param id 订单id
      */
     @GetMapping("exportOrderPdf")
@@ -344,6 +346,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 导出报工单PDF（批量）
+     *
      * @param ids 订单id列表
      */
     @PostMapping("exportOrderPdf1")

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java

@@ -5,10 +5,12 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.nflg.wms.admin.repository.InventoryCheckTaskScanRecordResitory;
+import com.nflg.wms.admin.util.NoUtil;
 import com.nflg.wms.common.constant.STATE;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.document.InventoryCheckTaskScanRecord;
+import com.nflg.wms.common.pojo.dto.MaterialQRCodeContentDTO;
 import com.nflg.wms.common.pojo.qo.*;
 import com.nflg.wms.common.pojo.vo.*;
 import com.nflg.wms.common.util.UserUtil;
@@ -61,7 +63,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 库存查看
-     *
      * @param request 请求参数
      */
     @PostMapping("search")
@@ -71,7 +72,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 保存库存盘点任务
-     *
      * @param request 请求参数
      */
     @PostMapping("check/save")
@@ -82,7 +82,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 查询库存盘点任务
-     *
      * @param request 请求参数
      */
     @PostMapping("check/search")
@@ -92,7 +91,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 获取库存盘点任务仓库列表
-     *
      * @param id 任务ID
      * @return 仓库列表
      */
@@ -122,7 +120,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 发布库存盘点任务
-     *
      * @param id 任务id
      */
     @PostMapping("check/publish")
@@ -133,7 +130,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 删除库存盘点任务
-     *
      * @param id ID
      */
     @PostMapping("check/delete")
@@ -152,7 +148,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 盘点任务扫码（PDA使用）
-     *
      * @param request 请求参数
      */
     @PostMapping("check/scan")
@@ -193,7 +188,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 批量保存盘点结果（PDA使用）
-     *
      * @param request 请求参数
      */
     @PostMapping("check/saveScan")
@@ -221,7 +215,6 @@ public class InventoryController extends BaseController {
                                 .setMaterialNo(qrCodeContent.getMaterialCode())
                                 .setMaterialDesc(qrCodeContent.getMaterialDescription())
                                 .setBatchNo(qrCodeContent.getBatchNo())
-                                .setBinNo(qrCodeContent.getBinLocation())
                                 .setItemId(item.getId())
                                 .setTaskId(item.getTaskId())
                                 .setNum(qrCodeContent.getQuantity());
@@ -238,7 +231,6 @@ public class InventoryController extends BaseController {
                             .materialId(material.getId())
                             .batchNo(qrCodeContent.getBatchNo())
                             .serialNo(qrCodeContent.getSerialNo())
-                            .binNo(qrCodeContent.getBinLocation())
                             .num(qrCodeContent.getQuantity())
                             .content(qrCode)
                             .createBy(UserUtil.getUserName())
@@ -269,7 +261,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 查看盘点结果
-     *
      * @param request 请求参数
      */
     @PostMapping("check/getMaterials")
@@ -279,7 +270,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 查询物料扫码记录
-     *
      * @param materialId 物料记录id
      * @return 扫码记录列表
      */
@@ -290,7 +280,6 @@ public class InventoryController extends BaseController {
 
     /**
      * 获取推荐出库批次信息
-     *
      * @param qo 请求参数
      */
     @PostMapping("getForOut")

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java

@@ -9,19 +9,19 @@ import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository;
 import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
 import com.nflg.wms.admin.service.BinService;
 import com.nflg.wms.admin.service.SapService;
+import com.nflg.wms.admin.util.NoUtil;
 import com.nflg.wms.common.constant.BarCodeProcessStage;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.document.OutMaterialScanRecord;
-import com.nflg.wms.common.pojo.dto.InventoryOutDTO;
-import com.nflg.wms.common.pojo.dto.OptRecordDTO;
-import com.nflg.wms.common.pojo.dto.ZWM3A06Input1DTO;
-import com.nflg.wms.common.pojo.dto.ZWM3A06Input2DTO;
+import com.nflg.wms.common.pojo.dto.*;
+import com.nflg.wms.common.pojo.qo.OutProduceSubmitItemQO;
 import com.nflg.wms.common.pojo.qo.OutPurchaseSearchQO;
 import com.nflg.wms.common.pojo.qo.QRCodeQO;
 import com.nflg.wms.common.pojo.vo.OutPurchaseVO;
 import com.nflg.wms.common.pojo.vo.ZWM3A05ItemVO;
 import com.nflg.wms.common.pojo.vo.ZWM3A05VO;
+import com.nflg.wms.common.pojo.vo.Zwm3a09VO;
 import com.nflg.wms.common.util.UserUtil;
 import com.nflg.wms.common.util.VUtil;
 import com.nflg.wms.repository.entity.*;
@@ -109,10 +109,11 @@ public class OutPurchaseController extends BaseController {
                 .gt(WmsReturnRequestItem::getLeft, 0)
                 .list();
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("所有物料均已完成");
+        order.setPoNum(items.get(0).getPoNumberNew());
         ZWM3A05VO vo = new ZWM3A05VO()
                 .setPurchaseOrderId(order.getId())
                 .setLifnr(order.getSupplierCode())
-                .setEbeln(order.getPoNumberNew())
+                .setEbeln(order.getPoNum())
                 .setItems(
                         items.stream()
                                 .map(it -> new ZWM3A05ItemVO()
@@ -124,7 +125,7 @@ public class OutPurchaseController extends BaseController {
                                         .setMeins(it.getUnit())
                                         .setLgort(it.getStorageLocation())
 //                                        .setEbelp(it.getPoLineNumberNew().toString())
-                                        .setEbelp(String.valueOf(it.getPoLineNumberNew()))
+                                        .setEbelp(Optional.ofNullable(it.getPoLineNumberNew()).map(Object::toString).orElse(""))
                                 )
                                 .toList()
                 );

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java

@@ -243,7 +243,7 @@ public class PurchaseReturnController extends BaseController {
                             .findFirst()
                             .get();
                     dbItem.setPoLineNumberNew(item.getEbelp());
-                    returnRequest.setPoNumberNew(item.getEbeln());
+                    dbItem.setPoNumberNew(item.getEbeln());
                 });
                 returnRequestItemService.updateBatchById(returnRequestItems);
             } else if (request.getDocumentType().equals(2)) { //24 退换货
@@ -271,7 +271,7 @@ public class PurchaseReturnController extends BaseController {
                                 .filter(it -> it.getMaterialCode().equals(materialNo))
                                 .findFirst().orElse( null);
                         dbItem.setPoLineNumberNew(item.getEbelp());
-                        returnRequest.setPoNumberNew(item.getEbeln());
+                        dbItem.setPoNumberNew(item.getEbeln());
                         returnRequestItemService.updateBatchById(returnRequestItems);
                     }
                 }
@@ -524,9 +524,16 @@ public class PurchaseReturnController extends BaseController {
     @GetMapping("exportTicket")
     public void exportTicket(HttpServletResponse response, @Valid @RequestParam @NotNull Long id) throws Exception {
         WmsReturnRequest order = returnRequestService.getById(id);
+        List<WmsReturnRequestItem> orderItem = returnRequestItemService.lambdaQuery()
+                .eq(WmsReturnRequestItem::getApplicationId, id)
+                .list();
+        if(CollectionUtil.isNotEmpty(orderItem))
+        {
+            order.setPoNum(orderItem.get(0).getPoNumberNew());
+        }
+
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("申请单不存在");
         VUtil.trueThrowBusinessError(order.getApprovalStatus() != 1).throwMessage("申请单未审核通过");
-        order.setPoNum(order.getPoNumberNew());
         UserSupplier supplier = userSupplierService.getByCode(order.getSupplierCode());
         List<WmsReturnRequestItem> list = returnRequestItemService.lambdaQuery()
                 .eq(WmsReturnRequestItem::getApplicationId, id)

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InventoryCheckTaskScanRecord.java

@@ -79,9 +79,4 @@ public class InventoryCheckTaskScanRecord {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Instant createTime;
-
-    /**
-     * 储位
-     */
-    private String binNo;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java

@@ -1,5 +1,6 @@
 package com.nflg.wms.common.pojo.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -109,14 +110,4 @@ public class ApplyReturnRequestItemVO {
      * 单位
      */
     private String unit;
-
-    /**
-     * sap过账的行号
-     */
-    private Integer poLineNumberNew;
-
-    /**
-     * 新的采购单号
-     */
-    private String poNumberNew;
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItemMaterial.java

@@ -59,9 +59,4 @@ public class WmsInventoryCheckTaskItemMaterial implements Serializable {
      * 数量
      */
     private BigDecimal num;
-
-    /**
-     * 储位
-     */
-    private String binNo;
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsReturnRequest.java

@@ -115,9 +115,4 @@ public class WmsReturnRequest implements Serializable {
      * 0 PC端，1 PDA端
      */
     private Short dataSource;
-
-    /**
-     * 新的采购单号
-     */
-    private String poNumberNew;
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsReturnRequestItem.java

@@ -128,4 +128,9 @@ public class WmsReturnRequestItem implements Serializable {
      * sap过账的行号
      */
     private Integer poLineNumberNew;
+
+    /**
+     * 新的采购单号
+     */
+    private String poNumberNew;
 }

nflg-wms-repository/src/main/resources/mapper/WmsInventoryCheckTaskMapper.xml

@@ -23,17 +23,14 @@
     </select>
 
     <select id="getMaterials" resultType="com.nflg.wms.common.pojo.vo.InventoryCheckTaskItemMaterialVO">
-        SELECT ictim.*,di."name" AS "factory_no",wh."no" AS "warehouse_no",i.inventory_num
+        SELECT ictim.*,di."name" AS "factory_no",wh."no" AS "warehouse_no",bin.no as "bin_no",i.num AS "inventory_num"
         FROM wms_inventory_check_task_item_material ictim
         LEFT JOIN wms_inventory_check_task_item icti ON ictim.item_id=icti."id"
         LEFT JOIN wms_warehouse wh ON icti.warehouse_id=wh."id"
         LEFT JOIN dictionary_item di ON di."id"=wh.factory_id
-        LEFT JOIN
-        (
-            SELECT material_no,factory_no,warehouse_no,batch_no,bin_location,SUM(num) as inventory_num
-            FROM wms_inventory
-            GROUP BY material_no,factory_no,warehouse_no,batch_no,bin_location
-        ) as i ON i.material_no=ictim.material_no AND i.factory_no=di.code AND i.warehouse_no=wh."no" AND i.batch_no=ictim.batch_no AND i.bin_location=ictim.bin_no
+        LEFT JOIN wms_inventory i ON ictim.material_no=i.material_no and i.factory_no=di.code AND i.warehouse_no=wh."no" AND i.batch_no=ictim.batch_no
+        LEFT JOIN wms_storage s ON s.material_no=ictim.material_no AND s.warehouse_id=icti.warehouse_id
+        LEFT JOIN wms_bin bin ON s.bin_id=bin.id
         WHERE ictim.task_id=#{request.taskId}
     </select>
 </mapper>

nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml

@@ -7,8 +7,6 @@
         ,oat.audit_time,oat.audit_msg,oa.*
         FROM wms_out_assistance_ticket oat
         INNER JOIN wms_out_assistance oa ON oat.order_id=oa."id"
-        INNER JOIN wms_out_assistance_ticket_item oati ON oati.ticket_id=oat."id"
-        INNER JOIN wms_out_assistance_item oai ON oai."id"=oati.order_item_id
         <where>
             <if test="request.no != null and request.no!=''">
                 AND oa."no" ilike CONCAT('%', #{request.no}, '%')
@@ -22,9 +20,6 @@
             <if test="request.lifnr!=null and request.lifnr!=''">
                 and lifnr like concat('%', #{request.lifnr}, '%')
             </if>
-            <if test="request.matnr!=null and request.matnr!=''">
-                and (oai.matnr like concat('%', #{request.matnr}, '%') OR oai.matnr1 like concat('%', #{request.matnr}, '%'))
-            </if>
             <if test="request.startDate!=null">
                 and oat.create_time >= #{request.startDate}
             </if>

nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml

@@ -49,19 +49,19 @@
                 and rr.application_no =#{request.applicationNo}
             </if>
             <if test="request.supplierCode !=null and request.supplierCode !=''">
-                and rr.supplier_code =#{request.supplierCode}
+                and rr.supplier_code =#{ request.supplierCode}
             </if>
             <if test="request.poNum !=null and request.poNum !=''">
-                and rr.po_num =#{request.poNum}
+                and rr.po_num =#{ request.poNum}
             </if>
-            <if test="request.approvalStatus !=null">
-                and rr.approval_status =#{request.approvalStatus}
+            <if test="request.approvalStatus !=null and request.approvalStatus !=''">
+                and rr.approval_status =#{ request.approvalStatus}
             </if>
-            <if test="request.documentType !=null">
-                and rr.document_type =#{request.documentType}
+            <if test="request.documentType !=null and request.documentType !=''">
+                and rr.document_type =#{ request.documentType}
             </if>
             <if test="request.purchaseGroup !=null and request.purchaseGroup !=''">
-                and rr.purchase_group =#{request.purchaseGroup}
+                and rr.purchase_group =#{ request.purchaseGroup}
             </if>
             <if test="request.startDate !=null">
                 and rr.approve_time>= #{request.startDate}
@@ -69,7 +69,6 @@
             <if test="request.endDate !=null">
                 and rr.approve_time &lt;= #{request.endDate}
             </if>
-            ORDER BY rr.approval_status,rr.id DESC
         </select>
 
 </mapper>