rev:回传修改、库存报表新增查询条件

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java

@@ -55,6 +55,7 @@ public class StructivtServiceImpl implements StructivtService {
         String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name");
         String ivt_status = MapUtil.getStr(whereJson, "ivt_status");
         String is_virtual = MapUtil.getStr(whereJson, "is_virtual");
+        String rein_flag = MapUtil.getStr(whereJson, "rein_flag");
         JSONObject map = new JSONObject();
         map.put("flag", "1");
         map.put("stor_id", stor_id);
@@ -95,6 +96,7 @@ public class StructivtServiceImpl implements StructivtService {
         String in_stor_id = userStorService.getInStor();
 
         if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id);
+        if (ObjectUtil.isNotEmpty(rein_flag)) map.put("rein_flag", rein_flag);
 
         JSONObject jsonObject = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc");
         return jsonObject;
@@ -199,6 +201,7 @@ public class StructivtServiceImpl implements StructivtService {
         String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn");
         String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name");
         String is_virtual = MapUtil.getStr(whereJson, "is_virtual");
+        String rein_flag = MapUtil.getStr(whereJson, "rein_flag");
         JSONObject map = new JSONObject();
         map.put("flag", "2");
         map.put("stor_id", stor_id);
@@ -238,6 +241,7 @@ public class StructivtServiceImpl implements StructivtService {
         String in_stor_id = userStorService.getInStor();
 
         if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id);
+        if (ObjectUtil.isNotEmpty(rein_flag)) map.put("rein_flag", rein_flag);
 
         JSONArray resultJSONArray = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).process().getResultJSONArray(0);
 

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql

@@ -25,6 +25,7 @@
 	输入.sale_order_name					    TYPEAS s_string
 	输入.package_box_sn					    TYPEAS s_string
 	输入.is_virtual					        TYPEAS s_string
+	输入.rein_flag					        TYPEAS s_string
 	输入.in_stor_id					        TYPEAS f_string
 
 [临时表]
@@ -52,6 +53,10 @@
 	IF 输入.flag = "1"
 		PAGEQUERY
 		SELECT
+        	a.*
+        FROM
+        	(
+			SELECT
                 ivt.*,
                 attr.sect_id,
                 attr.sect_code,
@@ -134,6 +139,24 @@
                 OPTION 输入.ivt_status = "frozen_qty"
                         ivt.frozen_qty > 0
                 ENDOPTION
+                ) a
+                INNER JOIN (
+                	SELECT
+                		dis.pcsn,
+                		mst.bill_type
+                	FROM
+                		st_ivt_iostorinvdis dis
+                		INNER JOIN ( SELECT MAX( iostorinvdis_id ) AS iostorinvdis_id, pcsn FROM st_ivt_iostorinvdis GROUP BY pcsn ) a ON a.iostorinvdis_id = dis.iostorinvdis_id
+                	INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+                	) b ON a.pcsn = b.pcsn
+                	WHERE
+                	1=1
+                	OPTION 输入.rein_flag = "1"
+                	    b.bill_type = '0002'
+                	ENDOPTION
+                	OPTION 输入.rein_flag = "0"
+                        b.bill_type <> '0002'
+                    ENDOPTION
 
 			ENDSELECT
 		ENDPAGEQUERY
@@ -141,6 +164,10 @@
 
 	IF 输入.flag = "2"
 		QUERY
+		SELECT
+                	a.*
+                FROM
+                	(
 			SELECT
                 ivt.*,
                 attr.sect_id,
@@ -223,6 +250,24 @@
                 ENDOPTION
                 OPTION 输入.areas <> ""
                     LEFT(sub.container_name,2) IN 输入.areas
+                 ENDOPTION
+                 ) a
+             INNER JOIN (
+                SELECT
+                    dis.pcsn,
+                    mst.bill_type
+                FROM
+                    st_ivt_iostorinvdis dis
+                    INNER JOIN ( SELECT MAX( iostorinvdis_id ) AS iostorinvdis_id, pcsn FROM st_ivt_iostorinvdis GROUP BY pcsn ) a ON a.iostorinvdis_id = dis.iostorinvdis_id
+                INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+                ) b ON a.pcsn = b.pcsn
+                WHERE
+                1=1
+                OPTION 输入.rein_flag = "1"
+                    b.bill_type = '0002'
+                ENDOPTION
+                OPTION 输入.rein_flag = "0"
+                     b.bill_type <> '0002'
                  ENDOPTION
 			ENDSELECT
 		ENDQUERY

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java

@@ -401,6 +401,9 @@ public class BakingServiceImpl implements BakingService {
             JSONObject last_hot_mst = WQLObject.getWQLObject("ST_IVT_HotRegionIOMst").query("container_name = '" + jsonHotIvt.getString("container_name") + "' AND io_type = '0' order by confirm_time desc").uniqueResult(0);
 
             JSONObject jsonRaw = rawTab.query("container_name = '" + jsonHotIvt.getString("container_name") + "' and is_delete = '0'").uniqueResult(0);
+            if(ObjectUtil.isEmpty(jsonRaw)){
+                throw new BadRequestException("未查询到母卷号："+jsonHotIvt.getString("container_name")+"对应的生箔工单！");
+            }
             JSONObject jsonMater = materTab.query("material_code = '" + jsonRaw.getString("product_name") + "'").uniqueResult(0);
             if (ObjectUtil.isEmpty(jsonMater)) {
                 throw new BadRequestException("物料基础信息中无此物料！");

lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java

@@ -207,7 +207,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 }
 
                 // 销售出库
-                if (StrUtil.equals(bill_type, "1001") && is_productstore.equals("1")) {
+//                if (StrUtil.equals(bill_type, "1001") && is_productstore.equals("1")) {
+                if (StrUtil.equals(bill_type, "1001")) {
                     // 2.回传mes
                     JSONObject paramMesMst = new JSONObject();
                     String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue();
@@ -217,7 +218,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     paramMesMst.put("Password", passWord);
                     paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code"));
                     paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname"));
-                    paramMesMst.put("iOutboundTime", jo_mst.getString("confirm_time"));
+                    paramMesMst.put("iOutboundTime", DateUtil.now());
 
                     JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2")
                             .addParam("iostorinv_id", jo_mst.getString("iostorinv_id"))
@@ -246,7 +247,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 }
 
                 // 调拨出库
-                if (StrUtil.equals(bill_type, "1004") && is_productstore.equals("1")) {
+//                if (StrUtil.equals(bill_type, "1004") && is_productstore.equals("1")) {
+                if (StrUtil.equals(bill_type, "1004")) {
                     // 2.回传mes
                     JSONObject paramMesMst = new JSONObject();
                     String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue();
@@ -256,7 +258,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     paramMesMst.put("Password", passWord);
                     paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code"));
                     paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname"));
-                    paramMesMst.put("iOutboundTime", jo_mst.getString("confirm_time"));
+                    paramMesMst.put("iOutboundTime", DateUtil.now());
 
                     JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2")
                             .addParam("iostorinv_id", jo_mst.getString("iostorinv_id"))
@@ -1137,7 +1139,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
 
                 // 2.回传mes
-                if (is_productstore.equals("1")) {
+                //if (is_productstore.equals("1")) {
                 JSONObject paramMesMst = new JSONObject();
                 String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue();
                 String passWord = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue();
@@ -1146,7 +1148,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 paramMesMst.put("Password", passWord);
                 paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code"));
                 paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname"));
-                    paramMesMst.put("iOutboundTime", jo_mst.getString("confirm_time"));
+                paramMesMst.put("iOutboundTime", DateUtil.now());
 
                 JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2")
                         .addParam("iostorinv_id", jo_mst.getString("iostorinv_id"))
@@ -1166,7 +1168,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst);
 
                 jo_mst.put("upload_mes", "1");
-                }
+                // }
                 jo_mst.put("is_upload", "1");
                 jo_mst.put("upload_optid", SecurityUtils.getCurrentUserId());
                 jo_mst.put("upload_time", DateUtil.now());
@@ -1238,7 +1240,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 paramMesMst.put("Password", passWord);
                 paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code"));
                 paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname"));
-                paramMesMst.put("iOutboundTime", jo_mst.getString("confirm_time"));
+                paramMesMst.put("iOutboundTime", DateUtil.now());
 
                 JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2")
                         .addParam("iostorinv_id", jo_mst.getString("iostorinv_id"))

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -134,6 +134,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="退货库存">
+            <el-select
+              v-model="query.rein_flag"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>

lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue

@@ -80,7 +80,7 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
           <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" />
+            <el-input v-model="form.point_code" style="width: 370px;" disabled/>
           </el-form-item>
           <el-form-item label="生产区域">
             <el-select
@@ -89,6 +89,7 @@
               placeholder="生产区域"
               class="filter-item"
               style="width: 370px;"
+              disabled
             >
               <el-option
                 v-for="item in dict.product_area"
@@ -125,6 +126,7 @@
               placeholder="位置"
               class="filter-item"
               style="width: 370px;"
+              disabled
             >
               <el-option
                 v-for="item in dict.point_location"
@@ -134,7 +136,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="顺序号" prop="sort_seq">
-            <el-input v-model="form.sort_seq" style="width: 370px;" />
+            <el-input v-model="form.sort_seq" style="width: 370px;" disabled/>
           </el-form-item>
           <el-form-item label="是否启用" prop="is_used">
             <el-switch v-model="form.is_used" active-value="1" inactive-value="0" />

lms/nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -481,7 +481,7 @@ export default {
     },
     outReturn() {
       alert('点击确认按钮后，单据进行回传！')
-      checkoutbill.outReturn({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+      checkoutbill.outReturn(this.currentRow).then(res => {
         this.crud.notify('回传成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.querytable()
       })