Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -558,6 +558,7 @@ public class IoOrderDetailBizController extends BaseController {
         ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo());
         ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate());
         ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate());
+        ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId());
         boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);
 
         return ResultVOUtils.success("成功");

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -360,6 +360,7 @@ public class ThrProductsAddDiController {
 
         FilterThrProductsRequest filterThrProductsRequest=new FilterThrProductsRequest();
         filterThrProductsRequest.setStatus(2);
+        filterThrProductsRequest.setDiType(1);
         List<ThrProductsAddDiEntity>  thrProductsAddDiEntityList=thrProductsAddDiService.filterThrProductsDiLists(filterThrProductsRequest);
 
         for (ThrProductsAddDiEntity thrProductsAddDiEntity:thrProductsAddDiEntityList){

src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.util.Date;
+
 import lombok.Data;
 
 @Data
@@ -98,10 +100,12 @@ public class IoOrderInvoiceEntity {
     private String licenseUrl;
 
 
-
     @TableField(value = "remark")
     private String remark;
 
+    @TableField(value = "bizIdFk")
+    private Integer bizIdFk;
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java

@@ -28,4 +28,6 @@ public class FilterOrderDetailBizRequest extends ListPageRequest {
      * 产品名称
      */
     private String productName;
+
+    private Long bizIdFk;
 }

src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java

@@ -67,6 +67,8 @@ public class IoOrderInvoiceRequest {
 
     private String remark;
 
+    private Long bizIdFk;
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java

@@ -9,9 +9,7 @@ import com.glxp.api.constant.ConstantType;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBusTypePreEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
-import com.glxp.api.entity.inout.IoCodeEntity;
-import com.glxp.api.entity.inout.IoCodeTempEntity;
-import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.service.auth.InvWarehouseService;
@@ -58,18 +56,21 @@ public class IoChangeInoutService {
     SystemParamConfigService systemParamConfigService;
     @Resource
     IoCodeTempService codeTempService;
+    @Resource
+    IoOrderInvoiceService ioOrderInvoiceService;
+    @Resource
+    IoOrderDetailBizService orderDetailBizService;
 
     public void changeOrder(IoOrderEntity orderEntity) {
 
         BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction());
         List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderEntity.getBillNo());
-        if (basicBusTypePreEntity != null) {
-            buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity);
-        } else {
-            //结束，不生成库存，
-        }
 
 
+        if (basicBusTypePreEntity != null) {
+            buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity, true);
+        }
+        //结束，不生成库存，
     }
 
 
@@ -86,7 +87,7 @@ public class IoChangeInoutService {
         List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderEntity.getBillNo());
         if (basicBusTypePreEntity.getSupplementAll()) {//全量补单
             invProductDetailService.insertList(invProductDetailEntities);
-            buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity);
+            buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity, false);
         } else {    //缺量补单
             List<IoCodeEntity> inList = new ArrayList<>();
             for (IoCodeEntity warehouseEntity : codeEnttities) {
@@ -108,7 +109,7 @@ public class IoChangeInoutService {
                 InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode());
                 invProductDetailService.insert(invProductDetailEntity);
             }
-            buildInOrder(basicBusTypePreEntity, inList, orderEntity);
+            buildInOrder(basicBusTypePreEntity, inList, orderEntity, false);
         }
     }
 
@@ -140,7 +141,7 @@ public class IoChangeInoutService {
     }
 
     //生成单据
-    public void buildInOrder(BasicBusTypePreEntity bussinessChangeTypeEntity, List<IoCodeEntity> useInList, IoOrderEntity orderEntity) {
+    public void buildInOrder(BasicBusTypePreEntity bussinessChangeTypeEntity, List<IoCodeEntity> useInList, IoOrderEntity orderEntity, boolean isGenInovice) {
 
 
         if (StrUtil.isEmpty(orderEntity.getRelKey())) {
@@ -231,6 +232,8 @@ public class IoChangeInoutService {
             outOrder.setCreateUser(null);
             outOrder.setReviewUser(null);
             orderService.insertOrder(outOrder);
+
+            //生成条码
             List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
             for (IoCodeEntity warehouseEntity : temps) {
                 IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
@@ -242,6 +245,19 @@ public class IoChangeInoutService {
                 codeTempEntities.add(codeTempEntity);
             }
             codeTempService.insertBatch(codeTempEntities);
+            if (isGenInovice) {
+                //生成发票信息
+                List<IoOrderInvoiceEntity> invoiceEntities = ioOrderInvoiceService.findByBillNo(orderEntity.getBillNo());
+                if (CollUtil.isNotEmpty(invoiceEntities)) {
+                    for (IoOrderInvoiceEntity orderInvoiceEntity : invoiceEntities) {
+                        orderInvoiceEntity.setOrderIdFk(outOrder.getBillNo());
+                        orderInvoiceEntity.setId(null);
+                        orderInvoiceEntity.setBizIdFk(null);
+                        orderInvoiceEntity.setUpdateTime(new Date());
+                        ioOrderInvoiceService.insertInvoice(orderInvoiceEntity);
+                    }
+                }
+            }
 
             //根据单据设置状态 1:草稿
             if (bussinessChangeTypeEntity.getAuditStatus() == 1) {

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -806,7 +806,6 @@ public class IoCheckInoutService {
             }
         }
 
-
         //校验是否是不入库存单据
         if (bussinessTypeEntity.isInStock()) {
 //        if (bussinessTypeEntity.getBusType() == ConstantStatus.BUS_TYPE_NORMAL) {

src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java

@@ -3,8 +3,13 @@ package com.glxp.api.service.inout;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 
+import java.util.List;
+
 public interface IoOrderInvoiceService {
 
+
+    List<IoOrderInvoiceEntity> findByBillNo(String billNo);
+
     boolean deleteByInvId(Integer id);
 
     boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest);

src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.inout.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
@@ -10,6 +11,7 @@ import com.glxp.api.service.inout.IoOrderInvoiceService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -17,20 +19,26 @@ public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService {
     @Resource
     IoOrderInvoiceMapper ioOrderInvoiceMapper;
 
+    @Override
+    public List<IoOrderInvoiceEntity> findByBillNo(String orderIdFk) {
+        return ioOrderInvoiceMapper.selectList(new QueryWrapper<IoOrderInvoiceEntity>().eq("orderIdFk", orderIdFk));
+    }
+
+
     @Override
     public boolean deleteByInvId(Integer id) {
-        return this.ioOrderInvoiceMapper.deleteById(id)>0;
+        return this.ioOrderInvoiceMapper.deleteById(id) > 0;
     }
 
     @Override
     public boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
         IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
-        BeanUtils.copyProperties(ioOrderInvoiceRequest,ioOrderInvoiceEntity);
-        return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity)>0;
+        BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity);
+        return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity) > 0;
     }
 
     @Override
     public boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) {
-        return ioOrderInvoiceMapper.insertInvoice(ioOrderInvoiceEntity);
+        return ioOrderInvoiceMapper.insert(ioOrderInvoiceEntity) > 0;
     }
 }

src/main/java/com/glxp/api/task/AsyncSpsTask.java

@@ -36,7 +36,7 @@ public class AsyncSpsTask implements SchedulingConfigurer {
                     scheduledRequest.setCronName("syncIdcSps");
                     logger.info("syncIdcSps----------------");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/50 * * * ?";
+                    String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/1 * * * ?";
 
                     if (cron.isEmpty()) {
                         logger.error("cron is null");

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -4,8 +4,8 @@
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
         select io_order_detail_biz.*
         from io_order_detail_biz
-                 left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
-                 left join basic_products bp on bu.uuid = bp.uuid
+                     left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+                     left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -24,19 +24,25 @@
     </select>
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        SELECT
-        ic.*,
-        (select cpmctymc from basic_products where  basic_products.uuid=bu.uuid) cpmctymc,
-        (select ggxh from basic_products where  basic_products.uuid=bu.uuid) ggxh
-        FROM
-        io_order_invoice ic
-        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
-        LEFT JOIN io_order_detail_biz io ON bu.id = io.bindRlFk
+        SELECT ic.*,
+               (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
+               (select ggxh from basic_products where basic_products.uuid = bu.uuid)     ggxh
+        FROM io_order_invoice ic
+                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
             </if>
+            <if test="relId != null">
+                AND ic.bindRlFk = #{relId}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ic.batchNo = #{batchNo}
+            </if>
+            <if test="bizIdFk != null and bizIdFk != ''">
+                AND ic.bizIdFk = #{bizIdFk}
+            </if>
         </where>
         GROUP BY ic.id
     </select>

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -260,6 +260,9 @@
         <if test="status != null">
             AND tdi.status = #{status}
         </if>
+        <if test="diType != null">
+            AND  updateTime &lt;= "2023-04-5 00:00:00"
+        </if>
     </where>
 </select>
 

src/main/resources/schemas/schema_v2.1.sql

@@ -18,6 +18,9 @@ CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ',
 
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1);
+
+
 
 CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1);