bug修改，业务单据扫码单据使用后端返回的单据类型名称，仓库名称

api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java

@@ -0,0 +1,48 @@
+package com.glxp.api.admin.controller.thrsys;
+
+import com.glxp.api.admin.annotation.AuthRuleAnnotation;
+import com.glxp.api.admin.dao.basic.UnitMaintainDao;
+import com.glxp.api.admin.dao.inventory.InvWarehouseDao;
+import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
+import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
+import com.glxp.api.admin.entity.basic.UnitMaintainEntity;
+import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.api.admin.entity.thrsys.ThrPostOrderRequest;
+import com.glxp.api.admin.req.inout.AddOrderRequest;
+import com.glxp.api.admin.req.inout.PostOrderRequest;
+import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
+import com.glxp.api.admin.service.basic.BussinessOriginTypeService;
+import com.glxp.api.admin.service.basic.UnitMaintainService;
+import com.glxp.api.common.res.BaseResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+public class ThrScOrderController {
+
+    @Resource
+    BussinessOriginTypeService bussinessOriginTypeService;
+    @Resource
+    UnitMaintainDao unitMaintainDao;
+    @Resource
+    InvWarehouseDao invWarehouseDao;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("udiwms/inout/thridOrder/upload")
+    public BaseResponse saveOrderWeb(@RequestBody ThrPostOrderRequest thrPostOrderRequest) {
+//        BussinessTypeEntity bussinessTypeEntity = bussinessOriginTypeService.findSysByAction(thrPostOrderRequest.getBillType(), thrPostOrderRequest.getThirdIdSys());
+
+        BussinessOriginTypeResponse bussinessOriginTypeEntity = bussinessOriginTypeService.finByThirdAction(thrPostOrderRequest.getBillType());
+        UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectByThirdSys(thrPostOrderRequest.getThirdIdSys(), thrPostOrderRequest.getFromCorpId());
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectByThirdSys(thrPostOrderRequest.getThirdIdSys(), thrPostOrderRequest.getInvCode());
+
+        PostOrderRequest postOrderRequest = new PostOrderRequest();
+
+
+
+    }
+
+}

api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java

@@ -24,4 +24,7 @@ public interface UnitMaintainDao {
      * @return
      */
     UnitMaintainEntity selectThirdInfoByErpId(@Param("erpId") String erpId);
+
+
+    UnitMaintainEntity selectByThirdSys(@Param("thirdIdSys") String thirdIdSys, @Param("thirdId") String thirdId);
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.dao.inventory;
 
+import com.glxp.api.admin.entity.basic.UnitMaintainEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
 import org.apache.ibatis.annotations.Param;
@@ -46,4 +47,6 @@ public interface InvWarehouseDao {
 
     boolean updateTime(@Param("code") String code, @Param("updateTime") Date updateTime);
 
+    InvWarehouseEntity selectByThirdSys(@Param("thirdIdSys") String thirdIdSys, @Param("thirdId") String thirdId);
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java

@@ -44,4 +44,7 @@ public class StockOrderEntity {
     private boolean entrustEnd;
 
 
+    private String billTypeName;
+    private String subInvName;
+    private String invName;
 }

api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java

@@ -58,4 +58,9 @@ public class OrderEntity {
     private boolean syncOutChange;
     private String createTime;
     private String fromSubInvCode;
+
+
+    private String billTypeName;
+    private String subInvName;
+    private String invName;
 }

api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java

@@ -0,0 +1,38 @@
+package com.glxp.api.admin.entity.thrsys;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ThrPostOrderRequest {
+
+    private String thirdIdSys;
+    private String billType;    //单据类型
+    private Integer inOutType;  //出入库类型：1：出，2：入；
+    private String orderId;     //订单号
+    private String fromCorpId;  //往来单位ID
+    private String fromCorp;    //往来单位名称
+    private String actDate;     //单据创建日期
+    private String actor;       //单据创建人名称
+    private String actorId;     //单据创建人ID，
+    private String invCode;     //当前所在仓库号
+    private String invName;     //当前所在仓库名称
+    private String subInvCode;  //当前所在分库号
+    private String subInvName;  //当前所在分库名称
+    private Integer status;     //单据状态
+    private List<CodeDetailEntity> codeArray;
+
+    @Data
+    public static class CodeDetailEntity {
+        private String code;            //条码
+        private String batchNo;         //批次号
+        private String produceDate;     //生产日期
+        private String expireDate;      //失效日期
+        private String serialNo;        //序列号
+        private Integer count;          //扫码数量
+        private String supId;       //供应商ID
+        private String supName;     //供应商名称
+
+    }
+}

api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml

@@ -55,4 +55,11 @@
         from basic_corp
         where erpId = #{erpId}
     </select>
+
+    <select id="selectByThirdSys" resultType="com.glxp.api.admin.entity.basic.UnitMaintainEntity">
+        select *
+        from basic_corp
+        where ${thirdIdSys} = #{thirdId}
+    </select>
+
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -191,7 +191,8 @@
 
     <select id="filterListOr" parameterType="com.glxp.api.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.api.admin.entity.inout.OrderEntity">
-        SELECT io_order.* FROM io_order
+        SELECT io_order.* ,inv_warehouse.name invName, inv_warehouse_sub.name subInvName ,basic_bussiness_type.name billTypeName FROM io_order
+        left join basic_bussiness_type on io_order.action = basic_bussiness_type.action
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
@@ -200,22 +201,22 @@
                 and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
-                and mainAction =#{mainAction}
+                and io_order.mainAction =#{mainAction}
             </if>
             <if test="fromCorpId != '' and fromCorpId!=null">
-                and fromCorpId =#{fromCorpId}
+                and io_order.fromCorpId =#{fromCorpId}
             </if>
             <if test="corpOrderId != '' and corpOrderId !=null">
-                and corpOrderId =#{corpOrderId}
+                and io_order.corpOrderId =#{corpOrderId}
             </if>
             <if test="action != '' and action!=null">
-                and action = #{action}
+                and io_order.action = #{action}
             </if>
             <if test="action==null or action == ''">
-                and `action`  <![CDATA[ <> ]]> 'StockCheck'
+                and io_order.`action`  <![CDATA[ <> ]]> 'StockCheck'
             </if>
             <if test="exportStatus != '' and exportStatus!=null">
-                and exportStatus = #{exportStatus}
+                and io_order.exportStatus = #{exportStatus}
             </if>
             <if test="status != '' and status!=null and status!=10">
                 and io_order.status = #{status}
@@ -245,18 +246,17 @@
                 <![CDATA[  and DATE_FORMAT(actDate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')    ]]>
             </if>
             <if test="customerId != '' and customerId!=null">
-                and customerId =#{customerId}
+                and io_order.customerId =#{customerId}
             </if>
             <if test="createUser!=null">
-                and createUser =#{createUser}
+                and io_order.createUser =#{createUser}
             </if>
             <if test="reviewUser!=null">
-                and reviewUser =#{reviewUser}
+                and io_order.reviewUser =#{reviewUser}
             </if>
             <if test="userId != '' and userId!=null">
                 and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
-                invWarehouseCode is null or
+                invWarehouseCode is null or invWarehouseCode='')
-                invWarehouseCode ='')
             </if>
 
             <if test="ullageSupNo != '' and ullageSupNo!=null">

api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml

@@ -259,4 +259,11 @@
         SET updateTime = #{updateTime}
         where code = #{code}
     </update>
+
+
+    <select id="selectByThirdSys" resultType="com.glxp.api.admin.entity.inventory.InvWarehouseEntity">
+        select *
+        from inv_warehouse
+        where ${thirdIdSys} = #{thirdId}
+    </select>
 </mapper>