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

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

@@ -448,7 +448,7 @@ public class IoCodeTempController extends BaseController {
         long recent = 0;
         if (udiRelevanceResponse.getRecentDateTime() != null)
             recent = udiRelevanceResponse.getRecentDateTime().longValue();
-        if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()&& udiRelevanceResponse.getIsDateBy()==2) {
+        if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 2) {
             if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
                 String expireDate = "20" + udiEntity.getExpireDate();
                 long expireTime = MsDateUtil.parseDateExpire(expireDate);
@@ -456,7 +456,7 @@ public class IoCodeTempController extends BaseController {
                 long resultTime = expireTime - System.currentTimeMillis();
 
                 if (resultTime > 0) {
-                    long time = resultTime / ( 60 * 60 * 1000);
+                    long time = resultTime / (60 * 60 * 1000);
 //                    long time = resultTime / (24 * 60 * 60 * 1000);
                     if (resultTime < recentTieme) {
                         return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "时,是否确定继续添加?");
@@ -465,7 +465,7 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy()==1) {
+        if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 1) {
             if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
                 String expireDate = "20" + udiEntity.getExpireDate();
                 long expireTime = MsDateUtil.parseDateExpire(expireDate);
@@ -1258,5 +1258,18 @@ public class IoCodeTempController extends BaseController {
         else return ResultVOUtils.error(500, "修改失败!");
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("warehouse/inout/checkTempCode")
+    public BaseResponse checkTempCode(@RequestBody IoCodeTempEntity codeTempEntity) {
+
+        Boolean falg=codeTempService.checkTempCode(codeTempEntity);
+        if(!falg){
+            return ResultVOUtils.error(999,"该产品已存在，请勿重复录入");
+        }
+
+        return ResultVOUtils.success();
+
+    }
+
 
 }

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

@@ -197,4 +197,5 @@ public class FilterOrderRequest extends ListPageRequest {
     private String unionRemark;
 
     private String remark;
+    private Integer confirmStatus;
 }

src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java

@@ -9,5 +9,6 @@ public class InnerOrderDetailRequest extends ListPageRequest {
     private String orderIdFk;
     private String productId;
     private String billNo;
+    private String nameCode;
 
 }

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -230,7 +230,7 @@ public class IoOrderResponse {
 
     //总金额
     private BigDecimal allAmount;
-
+    private Integer confirmStatus;
 
     /**
      * 校验信息

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

@@ -45,4 +45,6 @@ public interface IoCodeTempService {
     boolean isExit(String orderId);
 
     Integer selectExitCount(String orderId, String bacthNo, Long relId, String supId);
+
+    Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity);
 }

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

@@ -113,4 +113,21 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
         return ioCodeTempDao.selectExitCount(filterCodeRequest);
     }
 
+    @Override
+    public Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity) {
+
+        QueryWrapper<IoCodeTempEntity> ew=new QueryWrapper<>();
+        ew.eq("code",ioCodeTempEntity.getCode());
+        ew.eq("corpOrderId",ioCodeTempEntity.getCorpOrderId());
+        ew.eq("batchNo",ioCodeTempEntity.getBatchNo());
+        ew.eq("produceDate",ioCodeTempEntity.getProduceDate());
+        ew.eq("expireDate",ioCodeTempEntity.getExpireDate());
+        ew.eq("serialNo",ioCodeTempEntity.getSerialNo());
+        Long count = ioCodeTempDao.selectCount(ew);
+        if(count>0){
+            return false;
+        }
+        return true;
+    }
+
 }

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

@@ -503,6 +503,9 @@
                      LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
                      LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
         <where>
+            <if test="confirmStatus != null and confirmStatus != ''">
+                AND io.checkStatus = #{confirmStatus}
+            </if>
             <if test="id != null and id != ''">
                 AND io.id = #{id}
             </if>
@@ -630,7 +633,7 @@
                 order by ${orderBy} ${sort}
             </when>
             <otherwise>
-                order by updateTime desc
+                order by checkStatus asc,updateTime desc
             </otherwise>
         </choose>
     </select>

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

@@ -599,5 +599,6 @@ CREATE TABLE if not exists `io_destiny_process_detail`
 
 CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
 
-
+CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
+                         'varchar(255) ', 1);