代码备份，bug修复

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java

@@ -72,7 +72,7 @@ public class BussinessChangeTypeController {
                     bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
                     BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity();
                     bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\"");
-                    bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN);
+                    bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN);
                     bussinessChangeTypeEntity2.setIndex(1);
                     bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction());
                     bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2);

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -236,6 +236,26 @@ public class UdiRelevanceController {
         return ResultVOUtils.success("更新成功");
     }
 
+
+    //新增或修改关联
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/udirel/check/udi")
+    public BaseResponse checkUdi(@RequestBody CombineRequest combineRequest) {
+
+        List<String> keys = combineRequest.getKeys();
+        if (keys != null && keys.size() > 0) {
+
+            List<UdiRelevanceEntity> datas = udiRelevanceService.batchSelectByUuid(keys);
+            if (datas.isEmpty()) {
+                return ResultVOUtils.success("无被选入！");
+            } else {
+                return ResultVOUtils.error(499, "所选产品DI已经被"+"第三方产品ID"+"绑定，您确定继续对照");
+            }
+        }
+        return ResultVOUtils.success("合并成功");
+    }
+
+
     //新增或修改关联
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/revleance")

api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java

@@ -121,7 +121,11 @@ public class SystemParamConfigController {
             }
         } else if (systemParamConfigSaveRequest.getParamKey().equals("supplement_order_interval")) {
             try {
-                int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
+                int time = 1;
+                if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
+                    time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
+                }
+
                 String cornStr = CronUtils.parseMinuteIntervel(time);
                 ScheduledEntity scheduledEntity = new ScheduledEntity();
                 scheduledEntity.setCron(cornStr);

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java

@@ -13,7 +13,6 @@ public class BussinessLocalTypeEntity {
     private String mainAction;
     private String localName;
     private String remark;
-    private Boolean enable;
     private boolean checkEnable;
     private boolean advanceType;
     private boolean changeEnable;

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java

@@ -37,6 +37,10 @@ public class UdiInfoEntity {
     private String manufactory;
     private String measname;
     private Integer productType;
+    private String scbssfbhph;
+    private String scbssfbhxlh;
+    private String scbssfbhscrq;
+    private String scbssfbhsxrq;
 
 
     //本地生成信息

api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java

@@ -56,6 +56,11 @@ public class UdiRelevanceResponse {
     private Integer lockStatus;
     private String udplatCode;
     private Boolean isAdavence;
+    private String scbssfbhph;
+    private String scbssfbhxlh;
+    private String scbssfbhscrq;
+    private String scbssfbhsxrq;
+
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

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

@@ -23,4 +23,16 @@ public class StockOrderDetailResponse {
     private String ylqxzcrbarmc;
     private String zczbhhzbapzbh;
     private BigDecimal price;
+
+    //销售清单号（第二票）
+    private String secSalesListNo;
+
+    //销售发票号（第一票）
+    private String firstSalesInvNo;
+
+    //销售发票号（第二票）
+    private String secSalesInvNo;
+
+    //开票日期
+    private String invoiceDate;
 }

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java

@@ -4,6 +4,7 @@ package com.glxp.sale.admin.service.basic;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,6 +24,8 @@ public interface UdiRelevanceService {
 
     boolean isExitByUuid(String uuid);
 
+    List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids);
+
     List<UdiRelevanceEntity> selectByUuid(String uuid);
 
     UdiRelevanceEntity selectById(String id);

api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -95,6 +95,11 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
         return false;
     }
 
+    @Override
+    public List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids) {
+        return udiRelevanceDao.batchSelectByUuid(uuids);
+    }
+
     @Override
     public List<UdiRelevanceEntity> selectByUuid(String uuid) {
         return udiRelevanceDao.selectByUuid(uuid);

api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java

@@ -1070,14 +1070,12 @@ public class InvProductsTrService {
 
     public InvProductDetailEntity filterInvByCode(List<InvProductDetailEntity> invProductDetailEntities, String
             code) {
-
         for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
             if (invProductDetailEntity.getOriginCode().equals(code)) {
                 return invProductDetailEntity;
             }
         }
         return null;
-
     }
 
     public int getActCount(WarehouseEntity warehouseEntity) {

api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java

@@ -18,6 +18,7 @@ import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.entity.inout.*;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.entity.udid.UdiEntity;
 import com.glxp.sale.admin.httpclient.ErpOrderClient;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
@@ -51,6 +52,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -114,7 +116,7 @@ public class IoTransInoutService {
                         myErpOrderService.deleteByOrderId(postOrderRequest.getOldOrderId());
                     }
                     WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
-                    String orderId = System.currentTimeMillis() + i + "";
+                    String orderId = "SM" + CustomUtil.getId();
                     OrderEntity orderSaveRequest = new OrderEntity();
                     orderSaveRequest.setId(orderId);
                     if (warehouseEntity.getActDate() != null) {
@@ -175,8 +177,8 @@ public class IoTransInoutService {
                     }
 
                     WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
-                    String orderId = "SM" +
+                    String orderId = "SM" + CustomUtil.getId() + i + "";
-                            CustomUtil.getId() + i + "";
+
                     OrderEntity orderSaveRequest = new OrderEntity();
                     orderSaveRequest.setId(orderId);
                     if (warehouseEntity.getActDate() != null) {
@@ -366,6 +368,26 @@ public class IoTransInoutService {
                 return;
             }
 
+
+            //近效期提醒：
+            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip");
+            int recent = Integer.parseInt(systemParamConfigEntity.getParamValue());
+            if (recent > 0) {
+                UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
+                if (udiEntity.getExpireDate() != null) {
+                    String expireDate = "20" + udiEntity.getExpireDate();
+                    long expireTime = DateUtil.parseDateExpire(expireDate);
+                    if (expireTime - System.currentTimeMillis() < recent * 24 * 60 * 60 * 1000) {
+                        orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
+                        orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "临近过期！");
+                        return;
+                    }
+                }
+            }
+
+            //过期提醒：
+
+
             List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode());
             if (udiRelevanceResponses.size() == 1) {
                 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);

api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java

@@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil;
 import com.glxp.sale.admin.dao.info.ScheduledDao;
 import com.glxp.sale.admin.entity.info.ScheduledEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderEntity;
+import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.req.udid.ScheduledRequest;
 import com.glxp.sale.admin.res.inout.StockOrderResponse;
 import com.glxp.sale.admin.service.inout.OrderService;
 import com.glxp.sale.admin.service.inout.StockOrderService;
+import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
@@ -33,7 +35,8 @@ public class SupplementOrderTask implements SchedulingConfigurer {
     StockOrderService stockOrderService;
     @Resource
     OrderService orderService;
-
+    @Resource
+    SystemParamConfigService systemParamConfigService;
 
     @Override
     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
@@ -51,21 +54,27 @@ public class SupplementOrderTask implements SchedulingConfigurer {
     }
 
     private void process() {
-        log.info("开始扫描补单数据");
+
-        //计数器
+        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("supplement_order_interval");
-        AtomicInteger counter = new AtomicInteger(0);
+        if (!"0".equals(systemParamConfigEntity.getParamValue())) {
-        List<StockOrderEntity> orderEntities = stockOrderService.getSupplementOrderBillNoList();
+            log.info("开始扫描补单数据");
-        if (CollUtil.isNotEmpty(orderEntities)) {
+            //计数器
-            List<StockOrderResponse> stockOrderResponses = orderService.checkSupplementOrder(orderEntities);
+            AtomicInteger counter = new AtomicInteger(0);
-            for (StockOrderResponse stockOrderRespons : stockOrderResponses) {
+            List<StockOrderEntity> orderEntities = stockOrderService.getSupplementOrderBillNoList();
-                if (stockOrderRespons.isEnableSupplementOrder()) {
+            if (CollUtil.isNotEmpty(orderEntities)) {
-                    //此单据可以补单
+                List<StockOrderResponse> stockOrderResponses = orderService.checkSupplementOrder(orderEntities);
-                    orderService.supplementOrder(stockOrderRespons.getBillNo(), stockOrderRespons.getOrderIdFk());
+                for (StockOrderResponse stockOrderRespons : stockOrderResponses) {
-                    counter.addAndGet(1);
+                    if (stockOrderRespons.isEnableSupplementOrder()) {
+                        //此单据可以补单
+                        orderService.supplementOrder(stockOrderRespons.getBillNo(), stockOrderRespons.getOrderIdFk());
+                        counter.addAndGet(1);
+                    }
                 }
             }
+            log.info("补单结束，此次补单数量为：{}", counter.get());
         }
-        log.info("补单结束，此次补单数量为：{}", counter.get());
+
+
     }
 
 

api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java

@@ -150,6 +150,16 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
     }
 
 
+    public static Long parseDateExpire(String str) {
+        try {
+            return DateUtil.parseDate(str, "yyyyMMdd").getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return 0l;
+    }
+
+
     /**
      * 获取过去的天数
      *

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

@@ -13,9 +13,6 @@
             <if test="action != ''and action != null">
                 AND action LIKE concat(#{action},'%')
             </if>
-            <if test="enabled != ''and enabled != null">
-                AND enable =#{enabled}
-            </if>
             <if test="originAction != ''and originAction != null">
                 AND originAction =#{originAction}
             </if>
@@ -44,9 +41,6 @@
             <if test="action != ''and action != null">
                 AND basic_bustype_local.action LIKE concat(#{action},'%')
             </if>
-            <if test="enabled != ''and enabled != null">
-                AND basic_bustype_local.enable =#{enabled}
-            </if>
             <if test="enabled != ''and enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}
             </if>
@@ -76,9 +70,6 @@
             <if test="action != ''and action != null">
                 AND basic_bustype_local.action LIKE concat(#{action},'%')
             </if>
-            <if test="enabled != ''and enabled != null">
-                AND basic_bustype_local.enable =#{enabled}
-            </if>
             <if test="enabled != ''and enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}
             </if>
@@ -89,6 +80,7 @@
                 AND inv_warehouse_user.`code` = #{code}
             </if>
         </where>
+        group by basic_bussiness_type.action
     </select>
 
 
@@ -108,9 +100,6 @@
             <if test="action != ''and action != null">
                 AND basic_bustype_local.action LIKE concat(#{action},'%')
             </if>
-            <if test="enabled != ''and enabled != null">
-                AND basic_bustype_local.enable =#{enabled}
-            </if>
             <if test="spUse != ''and spUse != null">
                 AND spUse =#{spUse}
             </if>
@@ -121,10 +110,9 @@
     <insert id="insertBussinessType" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity">
         INSERT INTO basic_bustype_local
-        (action, name, enable, remark, originAction, advanceType, changeEnable, spUse)
+        (action, name, remark, originAction, advanceType, changeEnable, spUse)
         values (#{action},
                 #{name},
-                #{enable},
                 #{remark}, #{originAction}, #{advanceType}, #{changeEnable}, #{spUse})
     </insert>
 
@@ -133,7 +121,6 @@
         <trim prefix="set" suffixOverrides=",">
             <if test="action != null">action = #{action},</if>
             <if test="name != null">name = #{name},</if>
-            <if test="enable != null">enable = #{enable},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="originAction != null">originAction = #{originAction},</if>
             <if test="advanceType != null">advanceType = #{advanceType},</if>

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

@@ -116,6 +116,7 @@
                 AND basic_bustype_local.spUse =#{spUse}
             </if>
         </where>
+        group by basic_bussiness_type.action
 
     </select>
     <insert id="insertBussinessType" keyProperty="id"

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

@@ -36,9 +36,11 @@
         basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey,
         basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,
         basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,
-        basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType
+        basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
-
+        basic_products.scbssfbhph,
-
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq
         FROM (company_product_relevance
         inner JOIN basic_udirel
         ON company_product_relevance.udiRlIdFk = basic_udirel.id)
@@ -46,7 +48,6 @@
         ON basic_udirel.uuid = basic_products.uuid
 
 
-
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
@@ -58,16 +59,16 @@
                 AND nameCode LIKE concat(#{nameCode},'%')
             </if>
             <if test="unionCode != '' and unionCode != null">
-                or  nameCode LIKE concat('%',#{unionCode},'%')
+                or nameCode LIKE concat('%',#{unionCode},'%')
-                or  basic_udirel.ybbm LIKE concat('%',#{unionCode},'%')
+                or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%')
-                or  basic_udirel.sptm LIKE concat('%',#{unionCode},'%')
+                or basic_udirel.sptm LIKE concat('%',#{unionCode},'%')
             </if>
             <if test="thrPiId != '' and thrPiId != null">
-                or  thirdId LIKE concat('%',#{thrPiId},'%')
+                or thirdId LIKE concat('%',#{thrPiId},'%')
-                or  thirdId1 LIKE concat('%',#{thrPiId},'%')
+                or thirdId1 LIKE concat('%',#{thrPiId},'%')
-                or  thirdId2 LIKE concat('%',#{thrPiId},'%')
+                or thirdId2 LIKE concat('%',#{thrPiId},'%')
-                or  thirdId3 LIKE concat('%',#{thrPiId},'%')
+                or thirdId3 LIKE concat('%',#{thrPiId},'%')
-                or  thirdId4 LIKE concat('%',#{thrPiId},'%')
+                or thirdId4 LIKE concat('%',#{thrPiId},'%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
@@ -85,7 +86,7 @@
         </where>
         ORDER BY updateTime DESC
     </select>
-<!--//       AND company_product_relevance.auditStatus = 1-->
+    <!--//       AND company_product_relevance.auditStatus = 1-->
     <select id="findById" parameterType="java.lang.String"
             resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
         SELECT *
@@ -95,54 +96,66 @@
 
     <select id="findByUuid" parameterType="java.lang.String"
             resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
-        SELECT *   FROM  basic_products WHERE (
+        SELECT *
-        uuid = #{uuid} ) limit 1
+        FROM basic_products
+        WHERE (
+                  uuid = #{uuid}) limit 1
     </select>
 
     <select id="findByUuids" parameterType="java.lang.String"
             resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
-        SELECT *   FROM  basic_products WHERE (
+        SELECT *
-        uuid = #{uuid} )
+        FROM basic_products
+        WHERE (
+                  uuid = #{uuid})
     </select>
     <select id="findByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
-        SELECT *   FROM  basic_products WHERE (
+        SELECT *
-        nameCode = #{nameCode} ) limit 1
+        FROM basic_products
+        WHERE (
+                  nameCode = #{nameCode}) limit 1
     </select>
 
     <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
-        replace INTO basic_products
+        replace
+        INTO basic_products
         (
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
-        ,diType,productType)
+        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq)
         values
             (
-            #{nameCode},
+        #{nameCode},
-            #{packRatio},
+        #{packRatio},
-            #{packLevel},
+        #{packLevel},
-            #{bhxjsl},
+        #{bhxjsl},
-            #{bhzxxsbzsl},
+        #{bhzxxsbzsl},
-            #{zxxsbzbhsydysl},
+        #{zxxsbzbhsydysl},
-            #{bhxjcpbm},
+        #{bhxjcpbm},
-            #{bzcj},
+        #{bzcj},
-            #{addType},
+        #{addType},
-            #{deviceRecordKey},
+        #{deviceRecordKey},
-            #{cpmctymc},
+        #{cpmctymc},
-            #{cplb},
+        #{cplb},
-            #{flbm},
+        #{flbm},
-            #{ggxh},
+        #{ggxh},
-            #{qxlb},
+        #{qxlb},
-            #{tyshxydm},
+        #{tyshxydm},
-            #{ylqxzcrbarmc},
+        #{ylqxzcrbarmc},
-            #{zczbhhzbapzbh},
+        #{zczbhhzbapzbh},
-            #{ylqxzcrbarywmc},
+        #{ylqxzcrbarywmc},
-            #{uuid},
+        #{uuid},
-            #{sjcpbm},
+        #{sjcpbm},
-            #{versionNumber},
+        #{versionNumber},
-            #{diType},#{productType}
+        #{diType},
-            )
+        #{productType},
+        #{scbssfbhph},
+        #{scbssfbhxlh},
+        #{scbssfbhscrq},
+        #{scbssfbhsxrq}
+        )
     </insert>
 
     <insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
@@ -151,7 +164,7 @@
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
-        ,diType,productType
+        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq
         )
         values
 
@@ -180,17 +193,24 @@
             #{item.uuid},
             #{item.sjcpbm},
             #{item.versionNumber},
-            #{item.diType},#{item.productType}
+            #{item.diType},#{item.productType}, #{item.scbssfbhph},
+            #{item.scbssfbhxlh},
+            #{item.scbssfbhscrq},
+            #{item.scbssfbhsxrq}
             )
         </foreach>
     </insert>
 
     <delete id="deleteById" parameterType="Map">
-        DELETE FROM basic_products  WHERE id =  #{id}
+        DELETE
+        FROM basic_products
+        WHERE id = #{id}
     </delete>
 
     <delete id="deleteByUuid" parameterType="Map">
-        DELETE FROM basic_products  WHERE uuid =  #{uuid}
+        DELETE
+        FROM basic_products
+        WHERE uuid = #{uuid}
     </delete>
 
     <update id="updateUdiInfo" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
@@ -222,7 +242,10 @@
             <if test="measname != null">measname=#{measname},</if>
             <if test="diType != null">diType=#{diType},</if>
             <if test="productType != null">productType=#{productType},</if>
-
+            <if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
+            <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
+            <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
+            <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
         </trim>
         WHERE nameCode = #{nameCode}
     </update>
@@ -240,7 +263,7 @@
         (id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType,
         deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh,
         ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname,
-        productType) values
+        productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq) values
         <foreach collection="udiInfoEntities" item="item" index="index" separator=",">
             (#{item.id},
             #{item.nameCode},
@@ -271,7 +294,10 @@
             #{item.sptm},
             #{item.manufactory},
             #{item.measname},
-            #{item.productType})
+            #{item.productType}, #{item.scbssfbhph},
+            #{item.scbssfbhxlh},
+            #{item.scbssfbhscrq},
+            #{item.scbssfbhsxrq})
         </foreach>
     </insert>
 </mapper>

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

@@ -21,7 +21,10 @@
         basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,
         basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,
         basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,
-        basic_products.diType,basic_products.productType
+        basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq
         FROM basic_udirel
         inner JOIN basic_products
         ON basic_products.uuid = basic_udirel.uuid
@@ -96,7 +99,10 @@
         basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc,
         basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,
         basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
-        basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence
+        basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq
         FROM basic_products
         right JOIN basic_udirel
         ON basic_products.uuid = basic_udirel.uuid

api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml

@@ -42,7 +42,11 @@
         basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
         basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,
         basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
-        customer_info.companyName, basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence
+        customer_info.companyName,
+        basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq
         FROM company_product_relevance
         inner JOIN basic_udirel
         ON company_product_relevance.udiRlIdFk = basic_udirel.id
@@ -60,15 +64,15 @@
                 AND nameCode LIKE concat(#{nameCode},'%')
             </if>
             <if test="unionCode != '' and unionCode != null">
-               and (
+                and (
-                 nameCode LIKE concat('%',#{unionCode},'%')
+                nameCode LIKE concat('%',#{unionCode},'%')
                 or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%')
                 or basic_udirel.sptm LIKE concat('%',#{unionCode},'%')
                 )
             </if>
             <if test="thrPiId != '' and thrPiId != null">
-               and (
+                and (
-                 thirdId LIKE concat('%',#{thrPiId},'%')
+                thirdId LIKE concat('%',#{thrPiId},'%')
                 or thirdId1 LIKE concat('%',#{thrPiId},'%')
                 or thirdId2 LIKE concat('%',#{thrPiId},'%')
                 or thirdId3 LIKE concat('%',#{thrPiId},'%')
@@ -234,7 +238,8 @@
         #{update_time},
         #{auditStatus},
         #{productUuid},
-        #{udiRlIdFk},#{unitFk}
+        #{udiRlIdFk},
+        #{unitFk}
         )
     </insert>
 

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

@@ -83,6 +83,7 @@
             ,#{item.count}
             ,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId}
             ,#{item.relId},#{item.status},#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode})
+
         </foreach>
     </insert>
 
@@ -156,6 +157,7 @@
         FROM io_codes
         WHERE orderId = #{orderId}
     </delete>
+
     <update id="updateCode" parameterType="Map">
         UPDATE io_codes
         <trim prefix="set" suffixOverrides=",">

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

@@ -211,6 +211,7 @@
             </if>
 
         </where>
+        group by io_order.id
         ORDER BY actDate DESC
 
     </select>
@@ -281,6 +282,7 @@
                 and locStorageCode =#{locStorageCode}
             </if>
         </where>
+        group by io_order.id
         ORDER BY actDate DESC
     </select>
 
@@ -351,6 +353,7 @@
                 and locStorageCode =#{locStorageCode}
             </if>
         </where>
+        group by io_order.id
         ORDER BY actDate DESC
     </select>
 
@@ -414,7 +417,7 @@
                 and locStorageCode =#{locStorageCode}
             </if>
         </where>
-
+        group by io_order.id
     </select>
 
     <select id="findOne" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"

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

@@ -9,6 +9,7 @@
         FROM stock_order
                  INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
         where status = 'success'
+        group by stock_order.id
     </select>
 
     <select id="listStockOrderNoDealWith" parameterType="com.glxp.sale.admin.req.inout.StockOrderQueryRequest"
@@ -18,6 +19,7 @@
         from stock_order
         INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
         where `status` = '101'
+        group by stock_order.id
         ORDER BY id DESC
 
     </select>
@@ -171,6 +173,7 @@
                 and inv_warehouse_user.userId =#{userId}
             </if>
         </where>
+        group by stock_order.id
         ORDER BY id DESC
 
     </select>
@@ -237,7 +240,7 @@
         </where>
     </select>
     <select id="selectSupplementOrderList" resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
-        select billNo
+        select *
         from stock_order
         where supplementNo is null
            or supplementNo = ''

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

@@ -154,6 +154,7 @@
             GROUP BY #{groupType}
         </if>
     </select>
+
     <select id="stockStatistics" resultType="com.glxp.sale.admin.res.inventory.InvProductResponse"
             parameterType="com.glxp.sale.admin.req.inventory.FilterInvProductRequest">
         select bp.cpmctymc,

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

@@ -69,6 +69,7 @@
                 AND level = #{level}
             </if>
         </where>
+        group by inv_warehouse.code
 
     </select>
 

scripts/vue-admin.sql

@@ -23,4 +23,12 @@ reviewUser int NULL DEFAULT NULL COMMENT '审核用户ID'
 );
 
 
+alter table basic_products add
+    (
+scbssfbhph VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含批号',
+scbssfbhxlh VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含序列号',
+scbssfbhscrq VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含生产日期',
+scbssfbhsxrq VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含失效日期'
+);
+