Merge branch 'fencang' into busUser

# Conflicts:
#	api-admin/src/main/resources/application-dev.properties
#	api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

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

@@ -110,6 +110,12 @@ public class BasicThirdSysController {
                     return ResultVOUtils.error(500, "至少需需用一个第三方系统！");
                 }
             }
+
+            if (temp.getMainSys() && !temp.getEnabled()) {
+                return ResultVOUtils.error(500, "主系统必须启用");
+            }
+
+
             if (temp.getMainSys() != basicThirdSysEntity.getMainSys()) {
                 if (udiRelevanceService.isExit() || unitMaintainService.isExit()) {
                     return ResultVOUtils.error(999, "设置主系统失败");

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

@@ -109,6 +109,11 @@ public class BussinessOriginTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         if (bussinessTypeEntity != null) {
+            BussinessOriginTypeEntity bussinessOriginTypeEntity = bussinessOriginTypeService.findByAction(bussinessTypeEntity.getAction());
+            if (bussinessOriginTypeEntity != null) {
+                return ResultVOUtils.error(500, "单据类型已存在！");
+            }
+
             bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity);
         } else {
             return ResultVOUtils.error(999, "参数错误");

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

@@ -34,6 +34,7 @@ import com.glxp.sale.admin.service.inout.*;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.thread.InvProductsTrService;
+import com.glxp.sale.admin.thread.IoTransInoutService;
 import com.glxp.sale.admin.util.*;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -92,6 +93,8 @@ public class OrderController {
     CodesTempDao codesTempDao;
     @Resource
     private AuthAdminService authAdminService;
+    @Resource
+    IoTransInoutService ioTransInoutService;
 
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/inout/order/getUdi")
@@ -637,6 +640,9 @@ public class OrderController {
             mainOrderEntity.setErpFk(docidStr);
             mainOrderEntity.setUpdateTime(new Date());
             orderService.updateOrder(mainOrderEntity);
+            if (orderMergeRequest.getType() == 1) {
+                ioTransInoutService.transStatus(mainOrderEntity.getId());
+            }
 //            ioTransInoutService.transStatus(mainOrderEntity.getId());
         } else {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR);

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

@@ -360,6 +360,8 @@ public class OrderDetailController {
         filterErpOrderRequest.setLimit(null);
         List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest);
 
+
+
         OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId());
         if (orderEntity == null) {
             return ResultVOUtils.error(500, "单据不存在！");

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

@@ -43,6 +43,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 
 @RestController
@@ -158,8 +159,21 @@ public class StockOrderController {
             if (!verifyResult) {
                 return ResultVOUtils.error(500, "实际数量不能高于订单数量");
             }
+            List<String> filterList = new ArrayList<String>();
+            for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderPostRequest.getSubErpOrders()) {
+
+                filterList.add(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()) + StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()));
+
+            }
+            HashSet<String> set = new HashSet<>(filterList);
+            Boolean result = set.size() == filterList.size() ? true : false;
+            if (!result) {
+                return ResultVOUtils.error(500, "存在相同批次产品，提交失败！");
+            }
+
         }
 
+
         if (StringUtils.isBlank(stockOrderEntity.getId())) {
             BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
             if (StrUtil.isEmpty(stockOrderPostRequest.getBillNo())) {

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

@@ -628,7 +628,7 @@ public class StockOrderDetailController {
     @PostMapping("/udiwms/stock/order/detail/update")
     public BaseResponse updateStockOrderDetail(@RequestBody StockOrderDetailEntity stockOrderDetailEntity) {
         if (null != stockOrderDetailEntity)
-            stockOrderDetailService.updateById(stockOrderDetailEntity);
+            stockOrderDetailService.updateOrderDetailInfo(stockOrderDetailEntity);
         return ResultVOUtils.success("更新成功");
     }
 }

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

@@ -105,6 +105,11 @@ public class UdiTraceController {
                     udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc());
                     udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh());
                     udiTraceResponse.setOrderId(item.getId());
+                    InvProductDetailEntity invProductDetailEntity = invProductDetailEntities.get(0);
+                    udiTraceResponse.setBatchNo(invProductDetailEntity.getBatchNo());
+                    udiTraceResponse.setProduceDate(invProductDetailEntity.getProductionDate());
+                    udiTraceResponse.setExpireDate(invProductDetailEntity.getExpireDate());
+                    udiTraceResponse.setCount(invProductDetailEntity.getCount());
                 }
                 return udiTraceResponse;
             }).collect(Collectors.toList());

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

@@ -60,10 +60,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -99,7 +96,6 @@ public class WareHouseController {
     CompanyProductRelevanceService companyProductRelevanceService;
     @Resource
     SystemParamConfigService systemParamConfigService;
-    Logger logger = LoggerFactory.getLogger(StockOrderController.class);
     @Resource
     StockOrderService stockOrderService;
     @Resource
@@ -282,11 +278,6 @@ public class WareHouseController {
     @AuthRuleAnnotation("")
     @GetMapping("warehouse/inout/submitOrderWeb")
     public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
-//        if (null != orderEntity) {
-//            if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) {
-//                return ResultVOUtils.error(500, "分仓未选择");
-//            }
-//        }
         orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
         return saveOrderWeb(orderEntity);
     }
@@ -321,6 +312,30 @@ public class WareHouseController {
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/saveTempCode")
     public BaseResponse saveCode(@RequestBody WarehouseEntity warehouseEntity) {
+
+        if (StrUtil.isNotEmpty(warehouseEntity.getSerialNo()) && warehouseEntity.getSerialNo().length() > 20) {
+            return ResultVOUtils.error(500, "无效条码！序列号超出最大范围");
+        }
+
+        if (StrUtil.isNotEmpty(warehouseEntity.getBatchNo()) && warehouseEntity.getBatchNo().length() > 20) {
+            return ResultVOUtils.error(500, "无效条码！批次号超出最大范围");
+        }
+
+        if (StrUtil.isEmpty(warehouseEntity.getSerialNo()) && StrUtil.isEmpty(warehouseEntity.getBatchNo())) {
+            return ResultVOUtils.error(500, "批次号不能为空！");
+        }
+
+
+        if (StrUtil.isNotEmpty(warehouseEntity.getSerialNo())) {
+            List<WarehouseEntity> warehouseEntityList = codesTempService.findByOrderId(warehouseEntity.getOrderId());
+            for (WarehouseEntity object : warehouseEntityList) {
+                if (object.getId() != warehouseEntity.getId() && object.getCode().equals(warehouseEntity.getCode()) && StrUtil.nullToEmpty(object.getCode()).equals(warehouseEntity.getSerialNo())) {
+                    return ResultVOUtils.error(500, "条码重复！");
+                }
+            }
+        }
+
+
         boolean b = codesTempService.update(warehouseEntity);
         if (b)
             return ResultVOUtils.success("修改成功");
@@ -373,11 +388,7 @@ public class WareHouseController {
                 }
             }
         }
-
         return ResultVOUtils.success();
-
-//
-
     }
 
     @Resource
@@ -584,6 +595,9 @@ public class WareHouseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         AddCodeResult addCodeResult = new AddCodeResult();
+        if (addOrderRequest.getAction() == null) {
+            addOrderRequest.setAction(addOrderRequest.getBillType());
+        }
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction());
         String code = addOrderRequest.getCode();
         if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
@@ -909,7 +923,7 @@ public class WareHouseController {
             if (!StrUtil.emptyIfNull(originUdiEntity.getUdi()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {
                 continue;
             }
-            if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()))) {
+            if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).toUpperCase(Locale.ROOT).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()).toUpperCase(Locale.ROOT))) {
                 continue;
             }
             if (!StrUtil.emptyIfNull(originUdiEntity.getProduceDate()).equals(StrUtil.emptyIfNull(udiEntity.getProduceDate()))) {

api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java

@@ -33,5 +33,5 @@ public interface BussinessLocalTypeDao {
      *
      * @param action
      */
-    boolean selectPreInByOrderType(String action);
+    Boolean selectPreInByOrderType(String action);
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDetailDao.java

@@ -26,4 +26,12 @@ public interface InvPreProductDetailDao {
     boolean deleteByProductId(FilterInvProductDetailRequest filterInvProductDetailRequest);
 
     int statCount(FilterInvProductDetailRequest filterInvProductDetailRequest);
+
+    /**
+     * 根据orderId删除预验收库存详情
+     *
+     * @param orderIdFk 扫码单据ID
+     */
+    boolean deleteByOrderId(String orderIdFk);
+
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.entity.info;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -36,9 +37,13 @@ public class CompanyEntity {
     private String registerStatus;
     private String jyxkzh;
     private String jyxkzfzjg;
+
+    @JsonFormat(shape =JsonFormat.Shape.STRING,pattern ="yyyy-MM-dd")
     private Date jyxkzyxq;
     private String jybapzh;
     private String jybabm;
+
+    @JsonFormat(shape =JsonFormat.Shape.STRING,pattern ="yyyy-MM-dd")
     private Date fzrq;
     private String suihao;
     private String kaihuhang;

api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java

@@ -35,4 +35,11 @@ public interface StockOrderDetailService {
      * @return
      */
     boolean verifyCount(List<StockOrderDetailEntity> subErpOrders);
+
+    /**
+     * 更新业务单据详情信息
+     *
+     * @param stockOrderDetailEntity
+     */
+    void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity);
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java

@@ -284,8 +284,6 @@ public class OrderServiceImpl implements OrderService {
         supplementOrder.setMainAction(supplementType.getMainAction());
         supplementOrder.setAction(supplementType.getAction());
         supplementOrder.setErpFk(null);
-//        String time = DateUtil.getBeforeMinute(supplementOrder.getActDate(), 5);
-//        supplementOrder.setActDate(time);
 
         //复制码表
         List<WarehouseEntity> codes = codesDao.findByReceiptId(order.getId());
@@ -330,7 +328,8 @@ public class OrderServiceImpl implements OrderService {
         stockOrderEntityList.forEach(stockOrderEntity -> {
             StockOrderResponse response = new StockOrderResponse();
             BeanUtil.copyProperties(stockOrderEntity, response);
-            if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())) {
+            if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())
+                    && StrUtil.isEmpty(stockOrderEntity.getSupplementNo())) {
                 response.setEnableSupplementOrder(true);
             }
             result.add(response);
@@ -635,7 +634,10 @@ public class OrderServiceImpl implements OrderService {
      * @return
      */
     private boolean isPreInOrder(OrderEntity orderEntity) {
-        return bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction());
+        Boolean isTrue = bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction());
+        if (isTrue == null)
+            return false;
+        return isTrue;
     }
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java

@@ -108,4 +108,23 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService {
         return true;
     }
 
+    @Override
+    public void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity) {
+        if (null != stockOrderDetailEntity) {
+            if (StrUtil.isBlank(stockOrderDetailEntity.getInvoiceDate())) {
+                stockOrderDetailEntity.setInvoiceDate("");
+            }
+            if (StrUtil.isBlank(stockOrderDetailEntity.getFirstSalesInvNo())) {
+                stockOrderDetailEntity.setFirstSalesInvNo("");
+            }
+            if (StrUtil.isBlank(stockOrderDetailEntity.getSecSalesInvNo())) {
+                stockOrderDetailEntity.setSecSalesInvNo("");
+            }
+            if (StrUtil.isBlank(stockOrderDetailEntity.getSecSalesListNo())) {
+                stockOrderDetailEntity.setSecSalesListNo("");
+            }
+            stockOrderDetailDao.updateById(stockOrderDetailEntity);
+        }
+    }
+
 }

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

@@ -598,6 +598,7 @@ public class InvProductsTrService {
             outOrder.setFromCorp(basicUnitMaintainEntity.getName());
             outOrder.setFromCorpId(corpName);
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
+            outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");
             //互填单号
             orderEntity.setUllageSupNo(outOrder.getId());
@@ -644,7 +645,7 @@ public class InvProductsTrService {
             outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
             outOrder.setFromCorpId(null);
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
-
+            outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
             //互填单号
             orderEntity.setUllageSupNo(outOrder.getId());
             orderEntity.setUpdateTime(new Date());
@@ -720,7 +721,7 @@ public class InvProductsTrService {
 
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
-
+            outOrder.setInvStorageCode(orderEntity.getLocStorageCode());
 
             SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
             if ("1".equals(systemParamConfigEntity.getParamValue())) {
@@ -800,6 +801,7 @@ public class InvProductsTrService {
             outOrder.setFromCorpId(temps.get(0).getFromCorpId());
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");
             outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
+            outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
             outOrder.setErpFk(null);
             outOrder.setFromType(ConstantStatus.FROM_CHANGE);
             outOrder.setReceiveStatus(0);

api-admin/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 #spring.datasource.password=123456

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

@@ -141,7 +141,6 @@
             <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}

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

@@ -295,4 +295,12 @@
         </where>
 
     </select>
+
+
+    <delete id="deleteByOrderId">
+        delete
+        from inv_prein_product_detail
+        where orderIdFk = #{orderIdFk}
+    </delete>
+
 </mapper>

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

@@ -232,4 +232,13 @@
         </where>
 
     </select>
+
+
+
+    <delete id="deleteByOrderId">
+        delete
+        from inv_product_detail
+        where orderIdFk = #{orderIdFk}
+    </delete>
+
 </mapper>