修改

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java

@@ -487,15 +487,16 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             JSONObject struct_jo = new JSONObject();
             if (whereJson.containsKey("sect_id")) {
                 String need_sect = (String) whereJson.get("sect_id");
-                if (StrUtil.isNotEmpty(need_sect)){
+                JSONObject need_sect_jo = WQLObject.getWQLObject("st_ivt_sectattr").query("sect_id = '" + need_sect + "'").uniqueResult(0);
+                //判断是否为主存区，主存区调用自动分配，虚拟区调用普通查询
+                if (StrUtil.isNotEmpty(need_sect) && !need_sect_jo.getString("sect_type_attr").equals("00")) {
                     struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("sect_id = '" + need_sect + "' AND lock_type = '1' AND is_delete = '0' AND IFNULL( storagevehicle_code, '' ) = ''").uniqueResult(0);
                 } else {
-                    jo_form.put("sect_id", "1582991348217286656");
+                    jo_form.put("sect_id", whereJson.get("sect_id"));
                     struct_jo = this.autoDis(jo_form);
                 }
             } else {
-                jo_form.put("sect_id", "1582991348217286656");
-                struct_jo = this.autoDis(jo_form);
+                throw new BadRequestException("请选择需要分配的库区！");
             }
 
 

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql

@@ -452,7 +452,7 @@
                 	GROUP BY
                 	sa2.block_num,sa2.row_num,sa2.placement_type
                 	ORDER BY
-                	sa.placement_type desc,num
+                	sa2.placement_type desc,num
                 ENDSELECT
             ENDQUERY
         ENDIF