From 843d1ce390e018b8f547a73f751bea9391e881cc Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Thu, 11 Apr 2024 11:45:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(all):=20=E4=BF=AE=E6=94=B9=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E5=BF=97=E9=82=A6=E6=95=B0=E6=8D=AE=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/factorydata/zbom/mapper/OrderPackageMapper.xml    | 1 +
 .../logpm/factorydata/zbom/mapper/PackageInfoMapper.java    | 2 ++
 .../com/logpm/factorydata/zbom/mapper/ReceiptMapper.xml     | 2 +-
 .../com/logpm/factorydata/zbom/mapper/ZBReceiptMapper.java  | 4 +++-
 .../factorydata/zbom/service/impl/ReceiptServiceImpl.java   | 6 ++----
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml
index 62bf11649..5af4ea546 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/OrderPackageMapper.xml
@@ -35,6 +35,7 @@
             </if>
         </foreach>
         ) packageCodeIds where packageCodeIds.pid = t.package_code)
+        and t.sign_status = 0
         group by re.depart_code, t.platform_order_code
     </select>
     <select id="findNoSignNumber" resultType="com.logpm.factorydata.zbom.vo.NoSignNumberDTO">
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/PackageInfoMapper.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/PackageInfoMapper.java
index 1ce2b66fd..53e980fb9 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/PackageInfoMapper.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/PackageInfoMapper.java
@@ -18,6 +18,7 @@ package com.logpm.factorydata.zbom.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.factorydata.zbom.entity.ZbPackageInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 志邦包件物料信息 Mapper 接口
@@ -25,6 +26,7 @@ import com.logpm.factorydata.zbom.entity.ZbPackageInfoEntity;
  * @author pref
  * @since 2023-08-21
  */
+@Mapper
 public interface PackageInfoMapper extends BaseMapper<ZbPackageInfoEntity> {
 
 }
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/ReceiptMapper.xml b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/ReceiptMapper.xml
index f780a3743..873285664 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/ReceiptMapper.xml
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/ReceiptMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.logpm.factorydata.zbom.mapper.ZBReceiptMapper">
+<mapper namespace="com.logpm.factorydata.zbom.mapper.ZbReceiptMapper">
 
 </mapper>
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/ZBReceiptMapper.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/ZBReceiptMapper.java
index 57a511650..0c894309d 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/ZBReceiptMapper.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/ZBReceiptMapper.java
@@ -18,6 +18,7 @@ package com.logpm.factorydata.zbom.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.factorydata.zbom.entity.ZbReceiptEntity;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 志邦入库单 Mapper 接口
@@ -25,6 +26,7 @@ import com.logpm.factorydata.zbom.entity.ZbReceiptEntity;
  * @author pref
  * @since 2023-08-21
  */
-public interface ZBReceiptMapper extends BaseMapper<ZbReceiptEntity> {
+@Mapper
+public interface ZbReceiptMapper extends BaseMapper<ZbReceiptEntity> {
 
 }
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java
index 320b227ae..0c7538981 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java
@@ -16,10 +16,8 @@
  */
 package com.logpm.factorydata.zbom.service.impl;
 
-import com.logpm.factorydata.zbom.entity.ZbFactoryOrderLogEntity;
 import com.logpm.factorydata.zbom.entity.ZbReceiptEntity;
-import com.logpm.factorydata.zbom.mapper.FactoryOrderLogMapper;
-import com.logpm.factorydata.zbom.mapper.ZBReceiptMapper;
+import com.logpm.factorydata.zbom.mapper.ZbReceiptMapper;
 import com.logpm.factorydata.zbom.service.IReceiptService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +33,6 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 @AllArgsConstructor
-public class ReceiptServiceImpl extends BaseServiceImpl<ZBReceiptMapper, ZbReceiptEntity> implements IReceiptService {
+public class ReceiptServiceImpl extends BaseServiceImpl<ZbReceiptMapper, ZbReceiptEntity> implements IReceiptService {
 
 }