界面标题等logo修改

src/main/java/com/glxp/api/controller/auth/LoginController.java

@@ -14,6 +14,7 @@ import com.glxp.api.req.auth.PCLoginRequest;
 import com.glxp.api.req.auth.UpdatePasswordRequest;
 import com.glxp.api.res.auth.LoginResponse;
 import com.glxp.api.res.auth.LoginUserInfoResponse;
+import com.glxp.api.res.auth.WebTitleResponse;
 import com.glxp.api.service.system.CompanyService;
 import com.glxp.api.service.monitor.LogininforService;
 import com.glxp.api.common.enums.ResultEnum;
@@ -24,6 +25,7 @@ import com.glxp.api.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -294,4 +296,16 @@ public class LoginController extends BaseController {
         return ResultVOUtils.error(ResultEnum.DATA_CHANGE);
     }
 
+
+    @Value("${WEB_TITLE}")
+    private String WEB_TITLE;
+
+    @GetMapping("/spms/getTitleConfig")
+    public BaseResponse getTitleConfig() {
+        WebTitleResponse webTitleResponse = new WebTitleResponse();
+        webTitleResponse.setTitle(WEB_TITLE);
+        return ResultVOUtils.success(webTitleResponse);
+    }
+
+
 }

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

@@ -281,6 +281,8 @@ public class IoOrderReviewController extends BaseController {
     GennerOrderUtils gennerOrderUtils;
     @Resource
     SystemParamConfigService systemParamConfigService;
+    @Resource
+    IoAddInoutService addInoutService;
 
     public void transferOrder(IoOrderEntity orderEntity, EntrustReceEntity entrustReceEntity) {
         List<IoCodeEntity> warehouseEntities = codeService.findByOrderId(orderEntity.getBillNo());
@@ -292,16 +294,8 @@ public class IoOrderReviewController extends BaseController {
         String supplementOrderNo = orderNo;
         supplementOrder.setOriginUllageSupNo(orderEntity.getBillNo());
         supplementOrder.setBillNo(supplementOrderNo);
-
-//        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
-//        if ("1".equals(systemParamConfigEntity.getParamValue())) {
-//            supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);        //设置状态为补录单据
-//        } else {
-//            supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);        //设置状态为补录单据
-//        }
-
-
         supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);  //设置导出状态为未导出
+        supplementOrder.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
         supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
         //修改往来单位及当前库存号
         supplementOrder.setFromCorp(null);
@@ -335,6 +329,9 @@ public class IoOrderReviewController extends BaseController {
         orderEntity.setUllageSupNo(supplementOrder.getBillNo());
         orderService.update(orderEntity);
         codeTempService.insertBatch(supplementCodes);
+        for (IoCodeTempEntity codeTempEntity : supplementCodes) {
+            addInoutService.genOrderDetailCode(supplementOrder, codeTempEntity);
+        }
     }
 
 
@@ -543,8 +540,6 @@ public class IoOrderReviewController extends BaseController {
         return ResultVOUtils.success(acceptOrderEntity);
     }
 
-    @Resource
-    IoAddInoutService addInoutService;
 
     @Resource
     InvBusUserService invBusUserService;

src/main/java/com/glxp/api/res/auth/WebTitleResponse.java

@@ -0,0 +1,10 @@
+package com.glxp.api.res.auth;
+
+import lombok.Data;
+
+@Data
+public class WebTitleResponse {
+
+    private String title;
+
+}

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

@@ -185,7 +185,6 @@ public class IoGenInvService {
     }
 
 
-
     @Resource
     InvPreProductService invPreProductService;
     @Resource
@@ -312,7 +311,6 @@ public class IoGenInvService {
     }
 
 
-
     @Resource
     InvPreinProductService invPreinProductService;
 
@@ -381,7 +379,11 @@ public class IoGenInvService {
             invProductDetailEntity.setRelId(codeEntity.getRelId());
             invProductDetailEntity.setUpdateTime(new Date());
             invProductDetailEntity.setId(null);
+            if (StrUtil.isNotEmpty(codeEntity.getPreInSpaceCode())) {
                 invProductDetailEntity.setInvSpaceCode(codeEntity.getPreInSpaceCode());
+            } else {
+                invProductDetailEntity.setInvSpaceCode(codeEntity.getWarehouseCode());
+            }
             invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
             if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
                 invProductDetailEntity.setInCount(invProductDetailEntity.getReCount());

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/wms_cs?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?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
@@ -54,3 +54,4 @@ SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 back_file_path: D:/share/udisps/back/
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
+WEB_TITLE: 平潭协和医院

src/main/resources/application-pro.yml

@@ -51,5 +51,6 @@ SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 back_file_path: D:/share/udisps/back/
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
+WEB_TITLE: 平潭协和医院
 
 

src/main/resources/application-test.yml

@@ -50,4 +50,5 @@ UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
+WEB_TITLE: 平潭协和医院
 

src/main/resources/application-wmd.yml

@@ -51,5 +51,6 @@ SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 back_file_path: D:/share/udisps/back/
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
+WEB_TITLE: 平潭协和医院