opt:手工出库优化

mes/hd/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java

@@ -48,12 +48,7 @@ public class DataBaseConfig {
 
     @Bean(name = "dataSource1")
     @ConditionalOnExpression("${erp.oracle.enabled:true}")
-    @ConfigurationProperties(prefix = "spring.datasource.druid")
     public DataSource dataSource1() {
-        System.out.println("项目启动环境active"+active);
-        if ("dev".equals(active)){
-            return new DruidDataSource();
-        }
         System.out.println("是否连接oracle:"+oracleIsConnect);
         System.out.println("erp.oracle.jdbcurl:"+oracleJdbcUrl);
         System.out.println("erp.oracle.username:"+oracleUserName);

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java

@@ -43,7 +43,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
     @Override
     public Map<String, Object> pageQuery(Map whereJson, Pageable page) {
         HashMap<String, String> map = new HashMap<>(whereJson);
-        map.put("flag", "1");
+        map.put("flag", "101");
 
         if (StrUtil.isNotEmpty(map.get("bill_code"))) {
             map.put("bill_code", "%" + map.get("bill_code") + "%");
@@ -51,7 +51,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         String deptIds = DataAuthUtil.getDeptStr();
         map.put("deptIds", deptIds);
         if (StrUtil.isNotEmpty(map.get("buss_type"))) {
-            map.put("buss_type", whereJson.get("buss_type") + "%");
+            map.put("buss_type", map.get("buss_type"));
         }
         if (StrUtil.isNotEmpty(map.get("io_type"))) {
             map.put("io_type", map.get("io_type"));

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql

@@ -126,6 +126,48 @@
 		ENDPAGEQUERY
 	ENDIF
 
+	IF 输入.flag = "101"
+    		PAGEQUERY
+    			SELECT
+                	ios.*
+                FROM
+                	ST_IVT_IOStorInv ios
+                WHERE 1=1
+                   and ios.is_delete='0'
+                   OPTION 输入.bill_code <> ""
+                           ios.bill_code like 输入.bill_code
+                   ENDOPTION
+                   OPTION 输入.io_type <> ""
+                          ios.io_type = 输入.io_type
+                    ENDOPTION
+                    OPTION 输入.buss_type <> ""
+                          ios.buss_type  = 输入.buss_type
+                  ENDOPTION
+                   OPTION 输入.bill_type <> ""
+                        ios.bill_type = 输入.bill_type
+                   ENDOPTION
+                   OPTION 输入.stor_id <> ""
+                          ios.stor_id = 输入.stor_id
+                   ENDOPTION
+                   OPTION 输入.deptIds <> ""
+                         ios.sysdeptid in 输入.deptIds
+                   ENDOPTION
+                   OPTION 输入.create_mode <> ""
+                       ios.create_mode = 输入.create_mode
+                   ENDOPTION
+                   OPTION 输入.bill_status <> ""
+                      ios.bill_status = 输入.bill_status
+                   ENDOPTION
+                   OPTION 输入.begin_time <> ""
+                       ios.input_time >= 输入.begin_time
+                   ENDOPTION
+                   OPTION 输入.end_time <> ""
+                       ios.input_time <= 输入.end_time
+                   ENDOPTION
+    			ENDSELECT
+    		ENDPAGEQUERY
+    	ENDIF
+
 	IF 输入.flag = "01"
     		QUERY
     		 SELECT

mes/hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -3,7 +3,7 @@ server:
 #ERP系统相关
 erp:
   oracle:
-    enabled: true
+    enabled: false
     jdbcurl: jdbc:oracle:thin:@192.168.81.251:1522:ORCL2
     username: system
     password: 123456

mes/hd/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data:

mes/qd/package.json

@@ -5,8 +5,8 @@
   "author": "Zheng Jie",
   "license": "Apache-2.0",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
+    "dev": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build:prod": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",

mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue

@@ -387,8 +387,8 @@ export default {
     },
     tableChanged2(row) {
       for (let i = 0; i < this.form.tableData.length; i++) {
-        if (this.form.tableData[i].material_id === row.material_id) {
-          this.crud.notify('不允许添加相同物料！')
+        if (this.form.tableData[i].material_id === row.material_id && this.form.tableData[i].pcsn === row.pcsn) {
+          this.crud.notify('不允许添加批次相同物料！！')
           return false
         }
       }
@@ -437,6 +437,12 @@ export default {
         return false
       }
       for (let i = 0; i < this.form.tableData.length; i++) {
+        for (let j = i+1; j < this.form.tableData.length; j++) {
+          if (this.form.tableData[i].material_id === this.form.tableData[j].material_id && this.form.tableData[i].pcsn === this.form.tableData[j].pcsn) {
+            this.crud.notify('不允许添加相同批次物料！', CRUD.NOTIFICATION_TYPE.INFO)
+            return false
+          }
+        }
         if (!this.form.tableData[i].edit) {
           this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
           return false