单据类型修改，网页联通修改

api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java

@@ -27,7 +27,7 @@ public class ConnectTestController {
         AuthConnectEntity authConnectEntity = new AuthConnectEntity();
         authConnectEntity.setCompanyName(companyEntity.getName());
         authConnectEntity.setSysName("UDI管理系统");
-        return ResultVOUtils.success(companyEntity.getName());
+        return ResultVOUtils.success(authConnectEntity);
 
     }
 

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

@@ -251,7 +251,8 @@ public class OrderController {
 
 
             SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_review_order");
-            if (systemParamConfigEntity.getParamValue().equals("1")) {
+//            if (systemParamConfigEntity.getParamValue().equals("1")) {
+            if (bussinessTypeEntity.isEntrutSpms()) {
                 BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction());
                 return baseResponse;
             } else

api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java

@@ -57,5 +57,9 @@ public class BussinessTypeEntity {
     private String localPrefix;
     private boolean preIn;
     private boolean outTospms;
+    private boolean ullageFill;
+    private boolean scanPreIn;
+    private boolean vailInv;
 
+    private boolean entrutSpms;
 }

api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java

@@ -60,5 +60,9 @@ public class BussinessTypResponse {
     private String localPrefix;
     private boolean preIn;
     private boolean outTospms;
+    private boolean ullageFill;
+    private boolean scanPreIn;
+    private boolean vailInv;
 
+    private boolean entrutSpms;
 }

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -32,6 +32,7 @@ import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
 import com.glxp.api.admin.service.basic.BasicDownloadService;
 import com.glxp.api.admin.service.basic.BussinessChangeTypeService;
 import com.glxp.api.admin.service.basic.EntrustReceService;
+import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inout.OrderService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
 import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
@@ -80,6 +81,8 @@ public class DlBasicService {
     BussinessChangeTypeService bussinessChangeTypeService;
     @Resource
     private BasicDownloadService basicDownloadService;
+    @Resource
+    private SystemParamConfigService systemParamConfigService;
     private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class);
 
 //------------------------------------------------------------
@@ -436,7 +439,11 @@ public class DlBasicService {
                                     orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                                     orderEntity.setReceiveStatus(0);
                                     orderEntity.setErpFk(null);
-//                                    orderEntity.setOutChangeEnable(false);
+                                    String value = systemParamConfigService.selectValueByParamKey("syns_out_change");
+                                    if (value.equals("1")) {
+                                        orderEntity.setOutChangeEnable(true);
+                                    } else
+                                        orderEntity.setOutChangeEnable(false);
                                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                                     OrderEntity temp = orderService.findById(orderEntity.getId());
                                     if (temp == null) {

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -13,6 +13,8 @@
         basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,
         basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn,
         basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,
+        basic_bussiness_type.entrutSpms,
+        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv,
         basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
         basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,basic_bussiness_type.outTospms,
         basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,
@@ -127,7 +129,8 @@
         basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction,
         basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable,
         basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc,
-        basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,
+        basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,basic_bussiness_type.entrutSpms,
+        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv,
         basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn,
         basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,basic_bussiness_type.outTospms,
         basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
@@ -181,7 +184,8 @@
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
         ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
         secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne,
-        secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms)
+        secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms
+,ullageFill,scanPreIn,vailInv,entrutSpms)
         values
             (
         #{action},
@@ -217,7 +221,10 @@
         #{expireTip},
         #{updateTime},
         #{prefix},
-        #{outTospms}
+        #{outTospms} ,
+        #{ullageFill},
+        #{scanPreIn},
+        #{vailInv},#{entrutSpms}
         )
     </insert>
 
@@ -230,7 +237,9 @@
         checkEnable,genUnit,innerOrder,secCheckEnable,
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
         ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
-        secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms)
+        secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,
+defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms
+,ullageFill,scanPreIn,vailInv,entrutSpms)
         values
             (
         #{index},
@@ -267,7 +276,10 @@
         #{expireTip},
         #{updateTime},
         #{prefix},
-        #{outTospms}
+        #{outTospms},
+        #{ullageFill},
+        #{scanPreIn},
+        #{vailInv},#{entrutSpms}
         )
     </insert>
 
@@ -309,6 +321,11 @@
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="prefix != null">prefix=#{prefix},</if>
             <if test="outTospms != null">outTospms=#{outTospms},</if>
+            <if test="ullageFill != null">ullageFill=#{ullageFill},</if>
+            <if test="scanPreIn != null">scanPreIn=#{scanPreIn},</if>
+            <if test="vailInv != null">vailInv=#{vailInv},</if>
+            <if test="entrutSpms != null">entrutSpms=#{entrutSpms},</if>
+
             thirdSysFk=#{thirdSysFk},
         </trim>
         WHERE id = #{id}