Merge branch 'fencang' into busUser

# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
#	api-admin/src/main/resources/application-dev.properties
#	api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
#	api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml

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

@@ -81,7 +81,7 @@ public class UdiContrastController {
                 //关联添加
                 if (StrUtil.isEmpty(combineRequest.getRelId()) || combineRequest.isIdSpliUdi()) {
                     if (StrUtil.isNotEmpty(combineRequest.getThirdId())) {
-                        if (udiContrastService.isExit(key, combineRequest.getThirdId())) {
+                        if (udiContrastService.isExit(key, combineRequest.getThirdId(), null)) {
                             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
                         } else {
                             createUnionContrast(combineRequest, key);
@@ -105,7 +105,7 @@ public class UdiContrastController {
                         }
                     } else {
                         //只添加DI
-                        if (udiContrastService.isExit(key, null)) {
+                        if (udiContrastService.isExit(key, null, null)) {
                             return ResultVOUtils.error(500, "已存在该DI，且未对照！");
                         } else {
                             createOnlyUuid(combineRequest, key);
@@ -113,7 +113,7 @@ public class UdiContrastController {
                     }
                 } else {//修改关联DI
                     UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId());
-                    if (udiContrastService.isExit(key, udiRelevanceEntity.getMainId())) {
+                    if (udiContrastService.isExit(key, udiRelevanceEntity.getMainId(), null)) {
                         return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
                     } else {
                         updateDi(udiRelevanceEntity, key);
@@ -125,7 +125,7 @@ public class UdiContrastController {
             StringBuffer buffer = new StringBuffer();
             //只添加产品
             for (String thirdId : combineRequest.getThirdIds()) {
-                if (udiContrastService.isExit(null, thirdId)) {
+                if (udiContrastService.isExit(null, thirdId, null)) {
                     buffer.append(thirdId).append(",");
                 } else {
                     createOnlyMainId(combineRequest, thirdId);
@@ -145,7 +145,7 @@ public class UdiContrastController {
     @PostMapping("/udi/udirel/changeVersion")
     public BaseResponse changeVersion(@RequestBody CombineRequest combineRequest) {
         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId());
-        if (udiContrastService.isExit(combineRequest.getKeys().get(0), udiRelevanceEntity.getMainId())) {
+        if (udiContrastService.isExit(combineRequest.getKeys().get(0), udiRelevanceEntity.getMainId(), null)) {
             return ResultVOUtils.error(500, "已存在相同的对照关系，无法切换版本");
         }
         List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(combineRequest.getKeys().get(0));
@@ -180,7 +180,7 @@ public class UdiContrastController {
         udiRelevanceEntity.setSupName(combineRequest.getSupName());
         udiRelevanceEntity.setPrice(combineRequest.getPrice());
         UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
-        if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId())) {
+        if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId(), combineRequest.getThirdSys())) {
             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
         } else {
             try {
@@ -213,7 +213,7 @@ public class UdiContrastController {
             udiRelevanceEntity.setThirdId("");
             udiRelevanceEntity.setThirdName("");
             UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
-            if (udiContrastService.isExit(temp.getOriginUuid(), null)) {
+            if (udiContrastService.isExit(temp.getOriginUuid(), null, null)) {
                 return ResultVOUtils.error(500, "解除绑定失败！");
             }
         } else if (removeRelRequest.getThirdSys().equals("thirdId1")) {

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

@@ -54,7 +54,7 @@ public class CheckOrderUtils {
             filterUdiInfoRequest.setNameCode(myErpOrder.getNameCode());
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(myErpOrder.getBindRlFk());
             for (ErpOrderEntity vailOrderEntity : vailOrderEntities) {
-                if(!vailOrderEntity.isCheckSuccess()){
+                if (!vailOrderEntity.isCheckSuccess()) {
                     if (checkId(vailOrderEntity, udiRelevanceResponse, bussinessTypeEntity) == null
                             && checkBatchNo(vailOrderEntity, myErpOrder) == null
                             && checkProductDate(vailOrderEntity, myErpOrder) == null
@@ -129,7 +129,7 @@ public class CheckOrderUtils {
                     status = getStockOrderStatus(orderEntity, bussinessTypeEntity);
                     stockOrderEntity.setStatus(status);
                     stockOrderEntity.setOrderIdFk(orderId);
-                    if(orderEntity.getCustomerId().equals("110")){
+                    if (orderEntity.getCustomerId().equals("110")) {
                         stockOrderEntity.setReviewUser(orderEntity.getReviewUser());
                     }
                     stockOrderService.updateById(stockOrderEntity);
@@ -192,8 +192,7 @@ public class CheckOrderUtils {
                 if (bussinessTypeEntity.isSecCheckBalacne()) {
                     return ConstantStatus.SORDER_CHECKED;
                 }
-            }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
-            else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
                 if (bussinessTypeEntity.isSecCheckUdiwms()) {
                     return ConstantStatus.SORDER_CHECKED;
                 }
@@ -254,15 +253,15 @@ public class CheckOrderUtils {
                     if (vailOrderEntity.getGoodsid().equals(udiRelevanceResponse.getThirdId4() + ""))
                         return null;
                 }
-                return "产品ID不匹配！";
+                return vailOrderEntity.getCoName() + "产品ID不匹配！";
             }
 
 
         } else {
-            return "产品ID不匹配！";
+            return vailOrderEntity.getCoName() + "产品ID不匹配！";
         }
 
-        return "产品信息未找到！";
+        return vailOrderEntity.getCoName() + "产品信息未找到！";
     }
 
     public String checkBatchNo(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
@@ -274,7 +273,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "批次号不匹配！";
         }
-        return "批次号不匹配！";
+        return myErpOrder.getCoName() + "批次号不匹配！";
     }
 
     public String checkProductDate(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
@@ -286,7 +285,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "生产日期不匹配！";
         }
-        return "生产日期不匹配！";
+        return myErpOrder.getCoName() + "生产日期不匹配！";
     }
 
 
@@ -299,7 +298,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "失效日期不匹配！";
         }
-        return "失效日期不匹配！";
+        return myErpOrder.getCoName() + "失效日期不匹配！";
     }
 
 
@@ -312,7 +311,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "仓位号不匹配！";
         }
-        return "仓位号不匹配！";
+        return myErpOrder.getCoName() + "仓位号不匹配！";
     }
 
     public String checkCount(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {

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

@@ -3,12 +3,15 @@ package com.glxp.sale.admin.controller.thrsys;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.service.auth.CustomerService;
+import com.glxp.sale.admin.service.basic.BasicThirdSysService;
+import com.glxp.sale.admin.service.basic.UdiContrastService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsAddService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsService;
 import com.glxp.sale.admin.util.BeanUtils;
@@ -71,6 +74,12 @@ public class ThrProductsAddController {
         return ResultVOUtils.success("删除成功");
     }
 
+
+    @Resource
+    UdiContrastService udiContrastService;
+    @Resource
+    BasicThirdSysService basicThirdSysService;
+
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/thrsys/updateThrAddProducts")
     public BaseResponse updateThrAddProducts(@RequestBody ThrProductsAddEntity thrProductsAddEntity, BindingResult bindingResult) {
@@ -85,6 +94,12 @@ public class ThrProductsAddController {
             BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity);
             thrProductsEntity.setUpdateTime(new Date());
             thrProductsService.insertThrProducts(thrProductsEntity);
+            //审核通过后直接加到耗材字典里
+            BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
+            if (basicThirdSysEntity.getThirdId().equals(thrProductsAddEntity.getThirdSysFk()))
+                if (!udiContrastService.isExit(null, thrProductsAddEntity.getCode(), null)) {
+                    udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode());
+                }
         } else if (thrProductsAddEntity.getCheckStatus().equals(3)) {
             //不通过，删除第三方产品信息表中此产品数据
             thrProductsService.delete(thrProductsAddEntity);

api-admin/src/main/java/com/glxp/sale/admin/entity/receipt/ProductInfoEntity.java

@@ -52,10 +52,20 @@ public class ProductInfoEntity {
     private String expireDate;
 
     private Boolean isNewest;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     private String cplx;
     private String hchzsb;
 
+    private String sfwblztlcp;
+    private String cgzmraqxgxx;
+    private String sfbjwycxsy;
+    private String zdcfsycs;
+    private String sfwwjbz;
+    private String syqsfxyjxmj;
+    private String qtxxdwzlj;
+    private String mjfs;
+
+
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java

@@ -38,7 +38,8 @@ public class StockOrderFilterRequest extends ListPageRequest {
     private String entrustUser;
     private boolean entrustEnd;
     private String localAction;
-
+    private String startDate; //起始日期
+    private String endDate; //结束日期
 
     private String orderId;
 

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

@@ -9,6 +9,7 @@ public class UdiTraceResponse {
     private String actDate;
     private String mainAction;
     private String action;
+    private String actionName;
     private String fromCorp;
     private Integer count;
     private String cpmctymc;
@@ -17,4 +18,5 @@ public class UdiTraceResponse {
     private String batchNo;
     private String produceDate;
     private String expireDate;
+    private String billTypeName;
 }

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

@@ -2,9 +2,19 @@ package com.glxp.sale.admin.service.basic;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.dao.basic.UdiRelevanceDao;
+import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
+import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
+import com.glxp.sale.admin.service.thrsys.ThrProductsService;
+import com.glxp.sale.admin.util.CustomUtil;
+import com.glxp.sale.admin.util.DateUtil;
+import com.glxp.sale.admin.util.GennerOrderUtils;
+import com.glxp.sale.admin.util.UdiInfoUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -17,9 +27,9 @@ public class UdiContrastService {
     UdiRelevanceDao udiRelevanceDao;
 
 
-    public boolean isExit(String originUuid, String mainId) {
+    public boolean isExit(String originUuid, String mainId, String thirdSys) {
 
-        if (StrUtil.isNotEmpty(originUuid) && StrUtil.isNotEmpty(mainId)) {
+        if (StrUtil.isNotEmpty(originUuid) && StrUtil.isNotEmpty(mainId) && StrUtil.isBlank(thirdSys)) {
             List<UdiRelevanceEntity> udiRelevanceEntities = findByUnion(originUuid, mainId);
             if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
                 return true;
@@ -45,9 +55,23 @@ public class UdiContrastService {
                 }
             }
             return false;
-        } else return false;
+        } else if (StrUtil.isNotBlank(originUuid) && StrUtil.isNotBlank(mainId) && StrUtil.isNotBlank(thirdSys)) {
-
+            List<UdiRelevanceEntity> udiRelevanceEntities = findByUnion2(originUuid, mainId, thirdSys);
+            if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
+                return true;
+            } else
+                return false;
+        }
+        return false;
+    }
 
+    private List<UdiRelevanceEntity> findByUnion2(String originUuid, String mainId, String thirdSys) {
+        FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+        filterUdiInfoRequest.setMainId(mainId);
+        filterUdiInfoRequest.setOriginUuid(originUuid);
+        filterUdiInfoRequest.setThirdSys(thirdSys);
+        List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest);
+        return udiRelevanceEntities;
     }
 
     public List<UdiRelevanceEntity> findByUnion(String originUuid, String mainId) {
@@ -94,5 +118,53 @@ public class UdiContrastService {
         return udiRelevanceEntities;
     }
 
+    @Resource
+    GennerOrderUtils gennerOrderUtils;
+    @Resource
+    ThrProductsService thrProductsService;
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+    @Resource
+    UdiInfoService udiInfoService;
+
+    public void createOnlyMainId(String mainId) {
+        FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
+        filterThrProductsRequest.setCode(mainId);
+        List<ThrProductsEntity> thrProductsEntities = thrProductsService.selectThrProducts(filterThrProductsRequest);
+        ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0);
+        UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+        udiRelevanceEntity.setThirdId(thrProductsEntity.getCode());
+        udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
+        udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
+        udiRelevanceEntity.setMainName(thrProductsEntity.getName());
+        udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
+        String time = DateUtil.getDateTime();
+        udiRelevanceEntity.setUpdateTime(time);
+        udiRelevanceEntity.setModifyTime(time);
+        udiRelevanceEntity.setUuid(CustomUtil.getUUId());
+        udiRelevanceEntity.setSupName(thrProductsEntity.getSupName());
+        udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory());
+        udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
+        udiRelevanceEntity.setPrice(thrProductsEntity.getPrice());
+        udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
+        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+        BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity);
+        udiInfoEntity.setNameCode(thrProductsEntity.getCode());
+        udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
+        udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
+        udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
+        udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
+        udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
+        udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
+        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+        udiInfoEntity.setDiType(1);
+        udiInfoEntity.setScbssfbhph("是");
+        udiInfoEntity.setScbssfbhscrq("是");
+        udiInfoEntity.setScbssfbhsxrq("是");
+        udiInfoEntity.setScbssfbhxlh("否");
+        udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
+        udiInfoService.insertUdiInfo(udiInfoEntity);
+    }
+
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java

@@ -17,9 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailService {
@@ -103,7 +101,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
     public InvProductDetailEntity statInvPreInDetail(String code) {
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
         filterInvProductDetailRequest.setOriginCode(code);
-
+        filterInvProductDetailRequest.setMainAction(ConstantType.TYPE_PUT);
         List<InvProductDetailEntity> datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
         if (CollUtil.isEmpty(datas)) {
             filterInvProductDetailRequest.setOriginCode(null);

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

@@ -36,7 +36,7 @@ public class AsyncCompanyDlTask implements SchedulingConfigurer {
                     ScheduledRequest scheduledRequest = new ScheduledRequest();
                     scheduledRequest.setCronName("syncCompany");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    String cron = scheduledEntity.getCron();//"0 55 5 * * ?";
+                    String cron = scheduledEntity.getCron();
                     if (cron.isEmpty()) {
                         logger.error("cron is null");
                     }

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

@@ -360,6 +360,7 @@
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
         ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
         ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
+,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
         )
         values
             (
@@ -403,7 +404,15 @@
         #{updateTime},
         #{hchzsb},
         #{cplx},
-        #{hchzsb}
+        #{hchzsb},
+        #{sfwblztlcp},
+        #{cgzmraqxgxx},
+        #{sfbjwycxsy},
+        #{zdcfsycs},
+        #{sfwwjbz},
+        #{syqsfxyjxmj},
+        #{qtxxdwzlj},
+        #{mjfs}
         )
     </insert>
 
@@ -417,6 +426,7 @@
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
         ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
         ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
+        ,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
         ) values
 
         <foreach collection="datas" item="item" index="index"
@@ -461,7 +471,8 @@
             #{item.cpms},
             #{item.cpbsbmtxmc},
             #{item.isNewest},
-            #{item.updateTime},#{item.cplx},#{item.hchzsb}
+            #{item.updateTime},#{item.cplx},#{item.hchzsb},#{item.sfwblztlcp},#{item.cgzmraqxgxx},#{item.sfbjwycxsy},#{item.zdcfsycs}
+            ,#{item.sfwwjbz},#{item.syqsfxyjxmj},#{item.qtxxdwzlj},#{item.mjfs}
             )
         </foreach>
     </insert>
@@ -511,6 +522,15 @@
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="cplx != null">cplx=#{cplx},</if>
             <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+            <if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
+            <if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
+            <if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
+            <if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
+            <if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
+            <if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
+            </if>
+            <if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
+            <if test="mjfs != null">mjfs=#{mjfs},</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -530,7 +550,17 @@
             <if test="isNewest != null">isNewest=#{isNewest},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="cplx != null">cplx=#{cplx},</if>
-            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+            <if test="hchzsb != null">hchzsb=#{hchzsb},
+            </if>
+            <if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
+            <if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
+            <if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
+            <if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
+            <if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
+            <if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
+            </if>
+            <if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
+            <if test="mjfs != null">mjfs=#{mjfs},</if>
         </set>
         WHERE uuid = #{uuid}
     </update>

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

@@ -325,6 +325,23 @@
             <if test="id != '' and id != null">
                 AND basic_udirel.id = #{id}
             </if>
+            <if test="thirdSys != '' and thirdSys != null">
+                <if test="thirdSys == 'thirdId'">
+                    AND basic_udirel.thirdId = #{mainId}
+                </if>
+                <if test="thirdSys == 'thirdId1'">
+                    AND basic_udirel.thirdId1 = #{mainId}
+                </if>
+                <if test="thirdSys == 'thirdId2'">
+                    AND basic_udirel.thirdId2 = #{mainId}
+                </if>
+                <if test="thirdSys == 'thirdId3'">
+                    AND basic_udirel.thirdId3 = #{mainId}
+                </if>
+                <if test="thirdSys == 'thirdId4'">
+                    AND basic_udirel.thirdId4 = #{mainId}
+                </if>
+            </if>
         </where>
     </select>
 

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

@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime, deptCode)
+                             fromSubInvCode, createTime,invStorageCode,deptCode)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,7 +54,7 @@
                 #{stockCheckFk},
                 #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{deptCode})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime},#{invStorageCode}, #{deptCode})
     </insert>
 
 
@@ -65,7 +65,7 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, customerId, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,deptCode)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,invStorageCode,deptCode)
         values (
         #{id},
         #{action},
@@ -99,7 +99,7 @@
         #{replicateNo},
         #{invWarehouseCode},
         #{fromSubInvCode},
-        #{createTime},
+        #{createTime},#{invStorageCode},
         #{deptCode}
         )
     </insert>
@@ -141,6 +141,7 @@
             <if test="replicateNo != null and replicateNo != ''">replicateNo=#{replicateNo},</if>
             <if test="fromSubInvCode != null and fromSubInvCode != ''">fromSubInvCode=#{fromSubInvCode},</if>
             <if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
+            <if test="deptCode != null and deptCode != ''">deptCode=#{deptCode},</if>
 
         </trim>
         WHERE id = #{id}
@@ -583,7 +584,9 @@
 
     <select id="filterListByCode" parameterType="java.util.List"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT * FROM io_order WHERE id IN
+        SELECT io_order.*,basic_bussiness_type.name billTypeName FROM io_order
+        left join basic_bussiness_type on io_order.action =basic_bussiness_type.action
+        WHERE io_order.id IN
         <foreach collection="warehouseEntityList" item="item" open="(" separator="," close=")">
             #{item.orderId}
         </foreach>
@@ -591,7 +594,9 @@
 
     <select id="filterListByOrder" parameterType="java.util.List"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT * FROM io_order WHERE id IN
+        SELECT io_order.*,basic_bussiness_type.name billTypeName FROM io_order
+        left join basic_bussiness_type on io_order.action =basic_bussiness_type.action
+        WHERE io_order.id IN
         <foreach collection="orderList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>

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

@@ -205,6 +205,15 @@
             <if test="endTime!=null and endTime!=''">
                 <![CDATA[  and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')    ]]>
             </if>
+
+            <if test="startDate!=null and startDate!=''">
+                <![CDATA[   and DATE_FORMAT(billdate, '%Y-%m-%d')>=  DATE_FORMAT(#{startDate}, '%Y-%m-%d')   ]]>
+            </if>
+            <if test="endDate!=null and endDate!=''">
+                <![CDATA[  and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d')    ]]>
+            </if>
+
+
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>

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

@@ -90,6 +90,9 @@
             <if test="batchNo == 'empty'">
                 AND batchNo is NULL
             </if>
+            <if test="batchNo == '' || batchNo == null">
+                AND batchNo is NULL
+            </if>
             <if test="invWarehouseCode != '' and invWarehouseCode != null">
                 AND invWarehouseCode = #{invWarehouseCode}
             </if>