Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -95,7 +95,7 @@ public class BasicCorpController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<BasicCorpEntity> basicUnitMaintainEntities;
-        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
+        basicUnitMaintainEntities = basicUnitMaintainService.filterList2(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo;
         pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -134,7 +134,7 @@ public class UdiRelevanceController extends BaseController {
                 List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
                 if (temps != null && temps.size() > 0) {
                     filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
-                    filterUdiRelRequest.setNameCode(null);
+//                    filterUdiRelRequest.setNameCode(null);原为空
                 }
             }
 

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

@@ -456,7 +456,8 @@ public class IoCodeTempController extends BaseController {
                 long resultTime = expireTime - System.currentTimeMillis();
 
                 if (resultTime > 0) {
-                    long time = resultTime / (24 * 60 * 60 * 1000);
+                    long time = resultTime / ( 60 * 60 * 1000);
+//                    long time = resultTime / (24 * 60 * 60 * 1000);
                     if (resultTime < recentTieme) {
                         return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "时,是否确定继续添加?");
                     }
@@ -629,7 +630,7 @@ public class IoCodeTempController extends BaseController {
             } else if (StrUtil.isNotEmpty(addOrderRequest.getSelectSupId())) {
                 unitFk = addOrderRequest.getSelectSupId();
             }
-            //产品是否可以以使用单元入库
+            //产品是否禁用
             udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false);
             if (udiRelevanceResponses.size() >= 1) {
                 if (udiRelevanceResponse == null) {

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

@@ -332,6 +332,10 @@ public class IoOrderController extends BaseController {
     public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
 
         IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+        //补充备注
+        if(addOrderRequest.getRemark()!=null){
+            orderEntity.setRemark(addOrderRequest.getRemark());
+        }
         BaseResponse tempResponse = checkSubmitEnable(orderEntity);
         if (tempResponse != null)
             return tempResponse;

src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java

@@ -13,6 +13,7 @@ import java.util.List;
 @Mapper
 public interface BasicCorpDao extends BaseMapperPlus<BasicCorpDao, BasicCorpEntity, BasicCorpEntity> {
     List<BasicCorpEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
+    List<BasicCorpEntity> filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
 
     boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity);
 

src/main/java/com/glxp/api/service/basic/BasicCorpService.java

@@ -11,7 +11,7 @@ import java.util.List;
 public interface BasicCorpService {
 
     List<BasicCorpEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
-
+    List<BasicCorpEntity> filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
     boolean insertBasicUnitMaintain(BasicCorpEntity basicCorpEntity);
 
     boolean updateById(BasicCorpEntity basicCorpEntity);

src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java

@@ -36,7 +36,19 @@ public class BasicCorpServiceImpl implements BasicCorpService {
         List<BasicCorpEntity> data = basicCorpDao.filterList(basicUnitMaintainFilterRequest);
         return data;
     }
+    @Override
+    public List<BasicCorpEntity> filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
+        if (basicUnitMaintainFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (basicUnitMaintainFilterRequest.getPage() != null) {
+            int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit());
+        }
 
+        List<BasicCorpEntity> data = basicCorpDao.filterList2(basicUnitMaintainFilterRequest);
+        return data;
+    }
     @Override
     public boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse) {
         thrUnitMaintainResponse.setUpdateTime(new Date());

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

@@ -901,7 +901,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction());
                 if (thrOrderUploadBustypesEntity == null) {
                     log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传");
-                    return ResultVOUtils.error(500, billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传");
+                    continue;
                 }
                 if (!thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) {
                     log.error(billNo + ":" + "单据来源不允许自动提交");

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -182,7 +182,7 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         }
         List<InvProductDetailEntity> datas =
                 invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
-                        .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)
+                                .and(i-> i.isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq("batchNo","")).eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)
                         .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
                 );
 

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?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_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -56,6 +56,26 @@
         order by updateTime desc
     </select>
 
+
+
+
+
+
+    <select id="filterList2" parameterType="com.glxp.api.req.basic.BasicUnitMaintainFilterRequest"
+            resultType="com.glxp.api.entity.basic.BasicCorpEntity">
+        SELECT *
+        FROM basic_corp
+        <where>
+            <if test="key != '' and key != null">
+                and
+                (name like concat('%', #{key}, '%')
+
+                )
+            </if>
+        </where>
+        order by updateTime desc
+    </select>
+
     <select id="selectByThirdId" parameterType="com.glxp.api.req.basic.BasicUnitMaintainFilterRequest"
             resultType="com.glxp.api.entity.basic.BasicCorpEntity">
         select *

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1282,7 +1282,7 @@
                  isLock,
                  lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
                  updateUser,
-                 remark, useExpireTime, dispatch, groupBuy，needCert)
+                 remark, useExpireTime, dispatch, groupBuy,needCert)
                 values
 
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
@@ -1308,7 +1308,7 @@
              #{item.modifyTime},
              #{item.createUser},
              #{item.updateUser},
-             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}，#{item.needCert})
+             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy},#{item.needCert})
         </foreach>
     </insert>