领用单据相关bug修改，第三方业务单据修改

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java

@@ -37,8 +37,7 @@ import com.glxp.sale.admin.service.thrsys.ThrOrderService;
 import com.glxp.sale.admin.thread.InvDlErpStockService;
 import com.glxp.sale.admin.thread.InvProductsTrService;
 import com.glxp.sale.admin.thread.IoTransInoutService;
-import com.glxp.sale.admin.util.CustomUtil;
-import com.glxp.sale.admin.util.DateUtil;
+import com.glxp.sale.admin.util.*;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
@@ -80,6 +79,8 @@ public class OrderDetailController {
     @Resource
     private ThrOrderService thrOrderService;
     @Resource
+    GennerOrderUtils gennerOrderUtils;
+    @Resource
     private ThrOrderDetailService thrOrderDetailService;
 
     @Resource
@@ -232,7 +233,7 @@ public class OrderDetailController {
 
         StockOrderEntity stockOrderEntity = new StockOrderEntity();
         BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity);
-        String billNo = CustomUtil.getId();
+        String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.BUS_ORDER, "yyyyMMdd"));
         stockOrderEntity.setBillNo(billNo);
         BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByThirdAction(thrOrderEntity.getBillType());
         stockOrderEntity.setBillType(bussinessOriginTypeResponse.getLocalAction());
@@ -241,6 +242,7 @@ public class OrderDetailController {
         stockOrderEntity.setUnitIdFk(customerId);
         stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交
         stockOrderEntity.setLocStorageCode(filterErpOrderRequest.getLocStorageCode());
+        stockOrderEntity.setInvWarehouseCode(filterErpOrderRequest.getInvWarehouseCode());
         stockOrderEntity.setThirdOrderFk(thrOrderEntity.getBillNo());
         stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
         stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
@@ -255,11 +257,6 @@ public class OrderDetailController {
             List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
             for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
                 StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
-//                UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk());
-//
-//                if (udiRelevanceEntity == null) {
-//                    return ResultVOUtils.error(500, "单据里含有未维护的产品信息，选入失败！");
-//                }
                 BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity);
                 stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId());
                 stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
@@ -361,7 +358,6 @@ public class OrderDetailController {
         List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest);
 
 
-
         OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId());
         if (orderEntity == null) {
             return ResultVOUtils.error(500, "单据不存在！");

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

@@ -173,6 +173,21 @@ public class ThrOrderController {
 
     }
 
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/delOrderDetail")
+    public BaseResponse delOrderDetail(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        boolean b = thrOrderDetailService.deleteById(deleteRequest.getId());
+        if (b)
+            return ResultVOUtils.success("删除成功");
+        else return ResultVOUtils.error(500, "无法删除！");
+
+    }
+
     public String selectDelect(ThrOrderEntity thrOrderEntity) {
         FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
         filterErpOrderRequest.setErpOrderId(thrOrderEntity.getBillNo());
@@ -215,7 +230,7 @@ public class ThrOrderController {
             if (filterThrProductsRequest.getErpOrderResponses() != null) {//选中导出
                 thrOrdersDlService.importSelectOrders(genKey, filterThrProductsRequest.getErpOrderResponses(), filterThrProductsRequest.getThirdSysFk());
             } else {        //结果导出
-                thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(),null);
+                thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(), null);
             }
             return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看");
         }
@@ -241,10 +256,10 @@ public class ThrOrderController {
             thrOrderImportLogEntity.setUpdateTime(new Date());
             thrOrderImportLogEntity.setThirdSysFk(filterThrProductsRequest.getThirdSysFk());
             thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity);
-            if (filterThrProductsRequest.getErpOrderResponses() != null && filterThrProductsRequest.getErpOrderResponses().size()>0) {//选中导出
+            if (filterThrProductsRequest.getErpOrderResponses() != null && filterThrProductsRequest.getErpOrderResponses().size() > 0) {//选中导出
                 thrOrdersDlService.importSelectOrders(genKey, filterThrProductsRequest.getErpOrderResponses(), filterThrProductsRequest.getThirdSysFk());
             } else {        //结果导出
-                thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(),filterThrProductsRequest);
+                thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(), filterThrProductsRequest);
             }
             return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看");
         }

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

@@ -25,4 +25,29 @@ public class ThrOrderDetailEntity {
     private BigDecimal price; //单价
     private String corpName; //往来单位
 
+
+    private String sweepCount;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+
+    //销售清单号（第二票）
+    private String secSalesListNo;
+
+    //销售发票号（第一票）
+    private String firstSalesInvNo;
+
+    //销售发票号（第二票）
+    private String secSalesInvNo;
+
+    //开票日期
+    private String invoiceDate;
+    private String manufactory;
+    private boolean allowNoBatch;
+    private boolean allowNoExpire;
+    private boolean allowNoProduct;
+    private String code;
+    private String serialNo;
+
+    private Integer codeId;
+
 }

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

@@ -13,6 +13,7 @@ public class ThrOrderEntity {
     private String corpId;
     private String corpName;
     private String billType;
+    private String billTypeName;
     private String billFlag;
     private String thirdSysFk;
     private Date updateTime;
@@ -34,5 +35,6 @@ public class ThrOrderEntity {
     private String remark3; //备注3
 
     private String locStorageCode;
+    private String invWarehouseCode;
     private Integer editStatus;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java

@@ -35,6 +35,7 @@ public class ErpOrderResponse {
     private String remark1; //备注1
     private String remark2; //备注2
     private String remark3; //备注3
+    private String billTypeName;
 
     public String getStartDate() {
         return startDate;
@@ -252,6 +253,14 @@ public class ErpOrderResponse {
         this.fromSubInvCode = fromSubInvCode;
     }
 
+    public String getBillTypeName() {
+        return billTypeName;
+    }
+
+    public void setBillTypeName(String billTypeName) {
+        this.billTypeName = billTypeName;
+    }
+
     public static class SubErpOrder {
         private String productId;
         private String productName;
@@ -264,7 +273,7 @@ public class ErpOrderResponse {
         private String sweepCount;
         private String ylqxzcrbarmc;
         private String zczbhhzbapzbh;
-
+        private String manufactory;
         private String detailId; //明细ID
         private String corpName; //往来单位
         private BigDecimal price; //单价
@@ -389,6 +398,14 @@ public class ErpOrderResponse {
         public void setZczbhhzbapzbh(String zczbhhzbapzbh) {
             this.zczbhhzbapzbh = zczbhhzbapzbh;
         }
+
+        public String getManufactory() {
+            return manufactory;
+        }
+
+        public void setManufactory(String manufactory) {
+            this.manufactory = manufactory;
+        }
     }
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java

@@ -86,7 +86,7 @@ public class SyncUdiService {
             return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
         }
         productInfoFilterRequest.setIsNewest(1);
-        productInfoFilterRequest.setDiType("1");
+//        productInfoFilterRequest.setDiType("1");
 
         String keyCache = productInfoFilterRequest.toCacheKey();
         if (StrUtil.isEmpty(keyCache)) {

api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java

@@ -106,6 +106,9 @@ public class ProductInfoServiceImpl implements ProductInfoService {
         }
         if (productInfoFilterRequest.getPage() != null) {
             int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            if (offset < 0) {
+                offset = 0;
+            }
             productInfoFilterRequest.setPage(offset);
             productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit());
         } else {

api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.service.thrsys.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.thrsys.ThrOrderDao;
 import com.glxp.sale.admin.dao.thrsys.ThrOrderDetailDao;
@@ -95,6 +96,9 @@ public class ThrOrderServiceImpl implements ThrOrderService {
 
     @Override
     public ThrOrderEntity findByUnique(String billNo, String thirdSysFk) {
+        if (StrUtil.isEmpty(billNo) || StrUtil.isEmpty(thirdSysFk)) {
+            return null;
+        }
         FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
         filterThrOrderRequest.setBillNo(billNo);
         filterThrOrderRequest.setThirdSysFk(thirdSysFk);

api-admin/src/main/resources/application-dev.properties

@@ -1,10 +1,10 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph2?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
+#spring.datasource.password=root
 spring.datasource.password=123456
-#spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10
@@ -22,8 +22,8 @@ server.connectionTimeout=180000
 #file_path=/home/glxpdata/udiwms
 file_path=D:/glxpdata/udiwms
 UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
-#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
-UDI_SERVER_URL=http://127.0.0.1:9994
+UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
+#UDI_SERVER_URL=http://127.0.0.1:9994
 #UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml

@@ -5,13 +5,14 @@
 
     <select id="filterThrOrder" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest"
             resultType="com.glxp.sale.admin.entity.thrsys.ThrOrderEntity">
-        SELECT * FROM thr_order
+        SELECT thr_order.*,basic_bustype_origin.name billTypeName FROM thr_order
+        left join basic_bustype_origin on thr_order.billType = basic_bustype_origin.action
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}
             </if>
             <if test="id != '' and id !=null">
-                AND id = #{id}
+                AND thr_order.id = #{id}
             </if>
             <if test="billAction != '' and billAction !=null">
                 AND billType = #{billAction}
@@ -38,17 +39,14 @@
             <if test="endDate!=null and endDate!=''">
                 <![CDATA[  and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d')    ]]>
             </if>
-            <if test="editStatus != '' and editStatus != null">
+            <if test="editStatus!= null">
                 AND editStatus = #{editStatus}
             </if>
-            <!--            <if test="editStatus == '' or editStatus == null">-->
-            <!--                and `editStatus`  <![CDATA[ <> ]]> 1-->
-            <!--            </if>-->
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and DATE_FORMAT(thr_order.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
         </where>
-        ORDER BY updateTime DESC
+        ORDER BY thr_order.updateTime DESC
     </select>
 
 
@@ -57,7 +55,7 @@
         INTO thr_order
                 (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk,
                  startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
-                 remark3,locStorageCode,editStatus)
+                 remark3,locStorageCode,editStatus,invWarehouseCode)
         values (
         #{id},
         #{billNo},
@@ -82,7 +80,8 @@
         #{remark2},
         #{remark3},
         #{locStorageCode},
-        #{editStatus}
+        #{editStatus},
+        #{invWarehouseCode}
         )
     </insert>
 
@@ -90,7 +89,7 @@
         replace INTO thr_order
         (billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk,
         startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
-        remark3,locStorageCode,editStatus)
+        remark3,locStorageCode,editStatus,invWarehouseCode)
         values
 
         <foreach collection="thrOrderEntities" item="item" index="index"
@@ -104,7 +103,8 @@
             #{item.thirdSysFk}, #{item.updateTime}, #{item.originType}, #{item.unitIdFk},
             #{item.startDate}, #{item.endDate}, #{item.createUser}, #{item.reviewUser},
             #{item.address}, #{item.linkMan}, #{item.linkTel}, #{item.remark}, #{item.remark1},
-            #{item.remark2}, #{item.remark3},#{item.locStorageCode},#{item.editStatus})
+            #{item.remark2}, #{item.remark3},#{item.locStorageCode},#{item.editStatus},#{item.invWarehouseCode},
+            )
         </foreach>
     </insert>
 
@@ -145,7 +145,7 @@
             <if test="remark3 != null">remark3=#{remark3},</if>
             <if test="locStorageCode != null">locStorageCode=#{locStorageCode},</if>
             <if test="editStatus != null">editStatus=#{editStatus},</if>
-
+            <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -155,7 +155,7 @@
         INTO thr_order
                 (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType,
                  startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
-                 remark3)
+                 remark3,invWarehouseCode)
         values (
         #{id},
         #{billNo},
@@ -177,7 +177,8 @@
         #{remark},
         #{remark1},
         #{remark2},
-        #{remark3}
+        #{remark3},
+        #{invWarehouseCode}
         )
     </insert>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml

@@ -19,27 +19,43 @@
 
     <insert id="insertThrOrderDetail" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity">
-        replace INTO thr_order_detail
+        replace
+        INTO thr_order_detail
                 (productId, productName, spec, batchNo, expireDate,
-                 productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
-        values (#{productId}, #{productName}, #{spec}, #{batchNo}, #{expireDate},
-                #{productDate}, #{count}, #{reCount}, #{orderIdFk}, #{thirdSysFk}, #{updateTime},
-                #{price}, #{corpName})
+                 productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory)
+        values (
+        #{productId},
+        #{productName},
+        #{spec},
+        #{batchNo},
+        #{expireDate},
+        #{productDate},
+        #{count},
+        #{reCount},
+        #{orderIdFk},
+        #{thirdSysFk},
+        #{updateTime},
+        #{price},
+        #{corpName},
+        #{ylqxzcrbarmc},
+        #{zczbhhzbapzbh},
+        #{manufactory}
+        )
     </insert>
 
     <insert id="insertThrOrderDetails" keyProperty="id" parameterType="java.util.List">
         replace INTO thr_order_detail
-                (productId, productName, spec, batchNo, expireDate,
-                 productDate, count, reCount, orderIdFk, thirdSysFk, updateTime
-                        , price, corpName)
-                values
+        (productId, productName, spec, batchNo, expireDate,
+        productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime
+        , price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory)
+        values
 
         <foreach collection="thrOrderDetailEntities" item="item" index="index"
                  separator=",">
             (#{item.productId}, #{item.productName}, #{item.spec}, #{item.batchNo}, #{item.expireDate},
-             #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk},
-             #{item.updateTime},
-             #{item.price}, #{item.corpName})
+            #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk},
+            #{item.updateTime},
+            #{item.price}, #{item.corpName}, #{item.ylqxzcrbarmc}, #{item.zczbhhzbapzbh}, #{item.manufactory})
         </foreach>
     </insert>
 
@@ -48,7 +64,7 @@
         replace
         INTO thr_order_detail
                 (id,productId, productName, spec, batchNo, expireDate,
-                 productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
+                 productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory)
         values (
         #{id},
         #{productId},
@@ -63,15 +79,22 @@
         #{thirdSysFk},
         #{updateTime},
         #{price},
-        #{corpName}
+        #{corpName},
+        #{ylqxzcrbarmc},
+        #{zczbhhzbapzbh},
+        #{manufactory}
         )
     </insert>
 
     <delete id="deleteById" parameterType="Map">
-        DELETE FROM thr_order_detail  WHERE id =  #{id}
+        DELETE
+        FROM thr_order_detail
+        WHERE id = #{id}
     </delete>
     <delete id="deleteByOrderIdFk" parameterType="Map">
-        DELETE FROM thr_order_detail  WHERE orderIdFk =  #{orderIdFk}
+        DELETE
+        FROM thr_order_detail
+        WHERE orderIdFk = #{orderIdFk}
     </delete>
 
     <update id="updateThrOrderDetail" parameterType="com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity">
@@ -89,16 +112,19 @@
             <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="price != null">price=#{price},</if>
-            <if test="corpName != null">corpName=#{corpName},</if>
+            <if test="corpName != null">corpName=#{corpName},
+            </if>
+            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+            <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
+            <if test="manufactory != null">manufactory=#{manufactory},</if>
         </trim>
         WHERE id = #{id}
     </update>
 
 
-
-
     <delete id="deleteAll">
-        DELETE FROM thr_order_detail
+        DELETE
+        FROM thr_order_detail
     </delete>
 
 </mapper>