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

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

@@ -630,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/controller/purchase/IoPurChangeService.java

@@ -30,10 +30,9 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.awt.geom.QuadCurve2D;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -500,6 +499,7 @@ public class IoPurChangeService {
         //对计划单里面的供应商进行分组
         Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
         BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGDD);
+        Integer beforeTime = basicBusTypeChangeEntity.getBeforeTime();
         String billNo = "";
         if (purOrderEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED) {
             for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) {
@@ -518,9 +518,24 @@ public class IoPurChangeService {
                     ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
                     ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                 }
-
                 ioOrderEntity.setOrderType(1);
-                ioOrderEntity.setCreateTime(new Date());
+
+                //根据单据设置时间间隔推移
+                Date currentTime = new Date();//当前日期
+                Calendar cal =Calendar.getInstance();
+                cal.setTime(currentTime);
+                cal.add(Calendar.HOUR_OF_DAY,beforeTime);
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//定义新的日期格式
+                String dateString = formatter.format(cal.getTime());
+                Date date = null;
+                try {
+                    date = formatter.parse(dateString);//parse():String--->date
+                    System.out.println("转化为date格式：" + date);
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+
+                ioOrderEntity.setCreateTime(date);
 //                ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
                 ioOrderEntity.setUpdateTime(new Date());
 //                ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());

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/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>