诏安第三方单据上传，仓库不匹配问题，单据状态问题，无效验收人问题，

api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java

@@ -17,9 +17,11 @@ import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao;
 import com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao;
 import com.glxp.mipsdl.admin.dao.inout.CodesDao;
 import com.glxp.mipsdl.admin.dao.inout.OrderDao;
+import com.glxp.mipsdl.admin.dao.inventory.InvSubWarehouseDao;
 import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao;
 import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao;
 import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao;
+import com.glxp.mipsdl.admin.dao.thrsys.ThrSubInvWarehouseDao;
 import com.glxp.mipsdl.admin.entity.auth.AuthAdmin;
 import com.glxp.mipsdl.admin.entity.basic.*;
 import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity;
@@ -27,9 +29,11 @@ import com.glxp.mipsdl.admin.entity.business.StockOrderEntity;
 import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity;
 import com.glxp.mipsdl.admin.entity.inout.OrderEntity;
 import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity;
+import com.glxp.mipsdl.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity;
 import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity;
 import com.glxp.mipsdl.admin.entity.zy.ZaZyHeareRequest;
 import com.glxp.mipsdl.admin.req.*;
 import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest;
@@ -76,8 +80,12 @@ public class ZaxyyClient {
     @Resource
     private InvWarehouseDao invWarehouseDao;
     @Resource
+    private InvSubWarehouseDao invSubWarehouseDao;
+    @Resource
     private ThrInvWarehouseDao thrInvWarehouseDao;
     @Resource
+    private ThrSubInvWarehouseDao thrSubInvWarehouseDao;
+    @Resource
     private UnitMaintainDao unitMaintainDao;
     @Resource
     private BussinessTypeDao bussinessTypeDao;
@@ -272,6 +280,7 @@ public class ZaxyyClient {
         AuthAdmin authAdmin = authAdminDao.findById(userId.longValue());
         udiwmsOrderRequest.setThirdSys(authAdmin.getEmployeeName()); //第三方系统标识
         udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode());
+        udiwmsOrderRequest.setBillFlag("1");
 
         if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
             udiwmsOrderRequest.setCorpId(stockOrderEntity.getCorpName()); //往来单位编码，需转换为第三方系统的ID
@@ -306,15 +315,14 @@ public class ZaxyyClient {
             }
         }
 
-        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(orderEntity.getFromSubInvCode());
+        InvSubWarehouseEntity invWarehouseEntity = invSubWarehouseDao.selectOneByCode(orderEntity.getInvWarehouseCode());
         try {
-            ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId);
-            udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode());
-            udiwmsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName());
+            ThrSubInvWarehouseEntity thrInvWarehouseEntity = thrSubInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId);
+            udiwmsOrderRequest.setLocInvCode(thrInvWarehouseEntity.getCode());
+            udiwmsOrderRequest.setLocInvName(thrInvWarehouseEntity.getName());
         } catch (Exception e) {
             log.error("查询第三方系统仓库异常", e);
         }
-        udiwmsOrderRequest.setBillFlag(stockOrderEntity.getBillFlag()); //单据状态
         //查询单据出入库类型
         String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType());
         if (ConstantType.TYPE_PUT.equals(mainAction)) {
@@ -340,6 +348,12 @@ public class ZaxyyClient {
             item.setMeasname(udiRelevanceEntity.getMeasname());
             item.setStandard(stockOrderDetailEntity.getSpec());
             item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh());
+
+            item.setPrice(stockOrderDetailEntity.getPrice());
+            item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo());
+            item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo());
+            item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate());
+            item.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo());
             List<WarehouseEntity> warehouseEntityList = filterCodes(stockOrderDetailEntity, warehouseEntities);
             if (CollUtil.isNotEmpty(warehouseEntityList)) {
                 List<UdiwmsOrderDetail.CodeDetaiEntity> codeDetaiEntities = new ArrayList<>();

api-sync/src/main/java/com/glxp/mipsdl/admin/dao/inventory/InvSubWarehouseDao.java

@@ -0,0 +1,21 @@
+package com.glxp.mipsdl.admin.dao.inventory;
+
+import com.glxp.mipsdl.admin.entity.inventory.InvSubWarehouseEntity;
+import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface InvSubWarehouseDao {
+
+    List<InvSubWarehouseEntity> selectByCode(String code);
+
+    /**
+     * 查询单个仓库
+     *
+     * @param locStorageCode
+     * @return
+     */
+    InvSubWarehouseEntity selectOneByCode(String code);
+}

api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrInvWarehouseDao.java

@@ -2,10 +2,12 @@ package com.glxp.mipsdl.admin.dao.thrsys;
 
 import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+@Mapper
 public interface ThrInvWarehouseDao {
 
     List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest);

api-sync/src/main/java/com/glxp/mipsdl/admin/dao/thrsys/ThrSubInvWarehouseDao.java

@@ -0,0 +1,17 @@
+package com.glxp.mipsdl.admin.dao.thrsys;
+
+import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity;
+import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ThrSubInvWarehouseDao {
+
+    List<ThrSubInvWarehouseEntity> filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest);
+
+    ThrSubInvWarehouseEntity selectByCode(@Param("code") String code, @Param("thirdSysFk") String thirdSysFk);
+
+}

api-sync/src/main/java/com/glxp/mipsdl/admin/entity/inventory/InvSubWarehouseEntity.java

@@ -0,0 +1,25 @@
+package com.glxp.mipsdl.admin.entity.inventory;
+
+import lombok.Data;
+
+@Data
+public class InvSubWarehouseEntity {
+
+    public String id;
+    public String code;
+    public String name;
+    public String parentId;
+    public String remark;
+    public boolean defaultInv;
+
+    public String thirdId;
+    public String thirdName;
+    public String thirdId1;
+    public String thirdName1;
+    public String thirdId2;
+    public String thirdName2;
+    public String thirdId3;
+    public String thirdName3;
+    public String thirdId4;
+    public String thirdName4;
+}

api-sync/src/main/java/com/glxp/mipsdl/admin/entity/thrsys/ThrSubInvWarehouseEntity.java

@@ -0,0 +1,17 @@
+package com.glxp.mipsdl.admin.entity.thrsys;
+
+import lombok.Data;
+
+@Data
+public class ThrSubInvWarehouseEntity {
+
+
+    private String id;
+    private String code;
+    private String name;
+    private String parentId;
+    private String remark;
+    private String thirdSysFk;
+
+
+}

api-sync/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml

@@ -0,0 +1,16 @@
+<?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.glxp.mipsdl.admin.dao.inventory.InvSubWarehouseDao">
+
+    <select id="selectByCode" resultType="com.glxp.mipsdl.admin.entity.inventory.InvSubWarehouseEntity">
+        select *, name as pName
+        from inv_warehouse_sub
+        where code = #{code}
+    </select>
+    <select id="selectOneByCode" resultType="com.glxp.mipsdl.admin.entity.inventory.InvSubWarehouseEntity">
+        select *, name as pName
+        from inv_warehouse_sub
+        where code = #{code} limit 1
+    </select>
+</mapper>

api-sync/src/main/resources/mybatis/mapper/thrsys/ThrSubInvWarehouseDao.xml

@@ -0,0 +1,45 @@
+<?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.glxp.mipsdl.admin.dao.thrsys.ThrSubInvWarehouseDao">
+
+
+    <select id="filterThrInvWarehouse" parameterType="com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest"
+            resultType="com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity">
+        SELECT *
+        FROM thr_inv_warehouse_sub
+        <where>
+            <if test="id != '' and id != null">
+                AND id = #{id}
+            </if>
+            <if test="code != '' and code != null">
+                AND code = #{code}
+            </if>
+            <if test="name != '' and name != null">
+                AND `name` = #{name}
+            </if>
+            <if test="parentId != '' and parentId != null">
+                AND parentId = #{parentId}
+            </if>
+            <if test="thirdSysFk != null">
+                and thirdSysFk = #{thirdSysFk}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectByCode" resultType="com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity">
+        select * from thr_inv_warehouse_sub thrInv
+        left join basic_third_sys thrSys on thrInv.thirdSysFk = thrSys.thirdId
+        <where>
+            <if test="code != '' and code != null">
+                AND code = #{code}
+            </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
+        </where>
+        limit 1
+    </select>
+
+</mapper>