PDA出入库流程测试修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -316,7 +316,7 @@ public class PdaController {
      *
      * @return
      */
-    @PostMapping("/docOrder/doAllocation")
+    @GetMapping("/docOrder/doAllocation")
     public AjaxResult doAllocation(@RequestParam String orderNos) {
         List<String> orderList = JSONArray.parseArray(orderNos, String.class);
         List<String> orderNoList = wmsDocOrderHeaderService.changeErpNoToOrderNo(orderList);

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -20,7 +20,7 @@ import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 
 /**
  * spring security配置
- * 
+ *
  * @author ruoyi
  */
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
@@ -31,7 +31,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
      */
     @Autowired
     private UserDetailsService userDetailsService;
-    
+
     /**
      * 认证失败处理类
      */
@@ -49,13 +49,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
      */
     @Autowired
     private JwtAuthenticationTokenFilter authenticationTokenFilter;
-    
+
     /**
      * 跨域过滤器
      */
     @Autowired
     private CorsFilter corsFilter;
-    
+
     /**
      * 解决 无法直接注入 AuthenticationManager
      *
@@ -113,6 +113,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()
                 .antMatchers("/wcs/**").anonymous()
+                .antMatchers("/api/wcstask/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

ruoyi-ui/src/views/base/baseSku/index.vue

@@ -88,48 +88,48 @@
       <el-table-column label="物料编号" align="center" prop="sku" />
       <el-table-column label="物料类型" align="center" prop="skuType" />
       <el-table-column label="规格" align="center" prop="specs" />
-      <el-table-column label="型号" align="center" prop="model" />
+<!--      <el-table-column label="型号" align="center" prop="model" />-->
       <el-table-column label="物料名称" align="center" prop="desc1" />
-      <el-table-column label="描述2" align="center" prop="desc2" />
-      <el-table-column label="自赋码1" align="center" prop="selfCode1" />
-      <el-table-column label="自赋码2" align="center" prop="selfCode2" />
+<!--      <el-table-column label="描述2" align="center" prop="desc2" />-->
+<!--      <el-table-column label="自赋码1" align="center" prop="selfCode1" />-->
+<!--      <el-table-column label="自赋码2" align="center" prop="selfCode2" />-->
       <el-table-column label="是否危险品" align="center" prop="hazardFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.hazardFlag"/>
         </template>
       </el-table-column>
-      <el-table-column label="包装" align="center" prop="packId" />
-      <el-table-column label="皮重" align="center" prop="tare" />
-      <el-table-column label="毛重" align="center" prop="grossweight" />
-      <el-table-column label="净重" align="center" prop="netweight" />
+<!--      <el-table-column label="包装" align="center" prop="packId" />-->
+<!--      <el-table-column label="皮重" align="center" prop="tare" />-->
+<!--      <el-table-column label="毛重" align="center" prop="grossweight" />-->
+<!--      <el-table-column label="净重" align="center" prop="netweight" />-->
       <el-table-column label="是否激活" align="center" prop="activeFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.activeFlag"/>
         </template>
       </el-table-column>
-      <el-table-column label="上架库位" align="center" prop="putawayLocation" />
-      <el-table-column label="高" align="center" prop="skuHigh" />
-      <el-table-column label="长" align="center" prop="skuLength" />
-      <el-table-column label="宽" align="center" prop="skuWidth" />
-      <el-table-column label="库存上限" align="center" prop="qtymax" />
-      <el-table-column label="库存下限" align="center" prop="qtymin" />
-      <el-table-column label="默认收货单位" align="center" prop="defaultReceivingUom" />
-      <el-table-column label="默认发货单位" align="center" prop="defaultShipmentUom" />
-      <el-table-column label="质检规则" align="center" prop="qcRule" />
-      <el-table-column label="质检周期" align="center" prop="qcTime" />
-      <el-table-column label="有效期(天)" align="center" prop="shelflife" />
-      <el-table-column label="冷链标志" align="center" prop="coldFlag">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.coldFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="灭菌标志" align="center" prop="sterilizationFlag">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.sterilizationFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="养护周期(天)" align="center" prop="curingCycle" />
-      <el-table-column label="生产企业" align="center" prop="manufacturer" />
+<!--      <el-table-column label="上架库位" align="center" prop="putawayLocation" />-->
+<!--      <el-table-column label="高" align="center" prop="skuHigh" />-->
+<!--      <el-table-column label="长" align="center" prop="skuLength" />-->
+<!--      <el-table-column label="宽" align="center" prop="skuWidth" />-->
+<!--      <el-table-column label="库存上限" align="center" prop="qtymax" />-->
+<!--      <el-table-column label="库存下限" align="center" prop="qtymin" />-->
+<!--      <el-table-column label="默认收货单位" align="center" prop="defaultReceivingUom" />-->
+<!--      <el-table-column label="默认发货单位" align="center" prop="defaultShipmentUom" />-->
+<!--      <el-table-column label="质检规则" align="center" prop="qcRule" />-->
+<!--      <el-table-column label="质检周期" align="center" prop="qcTime" />-->
+<!--      <el-table-column label="有效期(天)" align="center" prop="shelflife" />-->
+<!--      <el-table-column label="冷链标志" align="center" prop="coldFlag">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.coldFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="灭菌标志" align="center" prop="sterilizationFlag">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.sterilizationFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="养护周期(天)" align="center" prop="curingCycle" />-->
+<!--      <el-table-column label="生产企业" align="center" prop="manufacturer" />-->
       <!--<el-table-column label="${comment}" align="center" prop="userdefine1" />
       <el-table-column label="${comment}" align="center" prop="userdefine2" />
       <el-table-column label="${comment}" align="center" prop="userdefine3" />
@@ -140,21 +140,21 @@
       <el-table-column label="${comment}" align="center" prop="userdefine8" />
       <el-table-column label="${comment}" align="center" prop="userdefine9" />
       <el-table-column label="${comment}" align="center" prop="userdefine10" />-->
-      <el-table-column label="是否检测效期" align="center" prop="expirationDateCheck">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.expirationDateCheck"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否允许超收" align="center" prop="overchargeCheck">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.overchargeCheck"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否需要质检" align="center" prop="qcCheck">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.qcCheck"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="是否检测效期" align="center" prop="expirationDateCheck">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.expirationDateCheck"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="是否允许超收" align="center" prop="overchargeCheck">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.overchargeCheck"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="是否需要质检" align="center" prop="qcCheck">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.qcCheck"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -212,35 +212,35 @@
               <el-input v-model="form.desc1" placeholder="请输入物料名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="描述" prop="desc2">
-              <el-input v-model="form.desc2" placeholder="描述" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="规格" prop="specs">
               <el-input v-model="form.specs" placeholder="请输入规格" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="型号" prop="model">
-              <el-input v-model="form.model" placeholder="请输入型号" />
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="描述" prop="desc2">-->
+<!--              <el-input v-model="form.desc2" placeholder="描述" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="自赋码1" prop="selfCode1">
-              <el-input v-model="form.selfCode1" placeholder="请输入自赋码1" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="自赋码2" prop="selfCode2">
-              <el-input v-model="form.selfCode2" placeholder="请输入自赋码2" />
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="型号" prop="model">-->
+<!--              <el-input v-model="form.model" placeholder="请输入型号" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+        </el-row>
+        <el-row>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="自赋码1" prop="selfCode1">-->
+<!--              <el-input v-model="form.selfCode1" placeholder="请输入自赋码1" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="自赋码2" prop="selfCode2">-->
+<!--              <el-input v-model="form.selfCode2" placeholder="请输入自赋码2" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -256,51 +256,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="皮重" prop="tare">
-              <el-input v-model="form.tare" placeholder="请输入皮重" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="毛重" prop="grossweight">
-              <el-input v-model="form.grossweight" placeholder="请输入毛重" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="净重" prop="netweight">
-              <el-input v-model="form.netweight" placeholder="请输入净重" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!--<el-row>-->
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="长" prop="skuLength">-->
-              <!--<el-input v-model="form.skuLength" placeholder="请输入长" />-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-          <!--<el-col :span="12">-->
-            <!--<el-form-item label="宽" prop="skuWidth">-->
-              <!--<el-input v-model="form.skuWidth" placeholder="请输入宽" />-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-        <!--</el-row>-->
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="库存上限" prop="qtymax">
-              <el-input v-model="form.qtymax" placeholder="请输入库存上限" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="库存下限" prop="qtymin">
-              <el-input v-model="form.qtymin" placeholder="请输入库存下限" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="是否检测效期" prop="expirationDateCheck">
-              <el-select v-model="form.expirationDateCheck" placeholder="请选择是否检测效期" style="width: 100%">
+            <el-form-item label="是否激活" prop="activeFlag">
+              <el-select v-model="form.activeFlag" placeholder="请选择是否激活" style="width: 100%">
                 <el-option
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
@@ -310,53 +267,99 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="有效期(天)" prop="shelflife">
-              <el-input v-model="form.shelflife" placeholder="请输入有效期(天)" />
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="皮重" prop="tare">-->
+<!--              <el-input v-model="form.tare" placeholder="请输入皮重" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="毛重" prop="grossweight">-->
+<!--              <el-input v-model="form.grossweight" placeholder="请输入毛重" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="净重" prop="netweight">-->
+<!--              <el-input v-model="form.netweight" placeholder="请输入净重" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="长" prop="skuLength">-->
+<!--              <el-input v-model="form.skuLength" placeholder="请输入长" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="宽" prop="skuWidth">-->
+<!--              <el-input v-model="form.skuWidth" placeholder="请输入宽" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="是否允许超收" prop="overchargeCheck">
-              <el-select v-model="form.overchargeCheck" placeholder="请选择是否允许超收" style="width: 100%">
-                <el-option
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否需要质检" prop="qcCheck">
-              <el-select v-model="form.qcCheck" placeholder="请选择是否需要质检" style="width: 100%">
-                <el-option
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="库存上限" prop="qtymax">-->
+<!--              <el-input v-model="form.qtymax" placeholder="请输入库存上限" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="库存下限" prop="qtymin">-->
+<!--              <el-input v-model="form.qtymin" placeholder="请输入库存下限" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+        </el-row>
+        <el-row>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="是否检测效期" prop="expirationDateCheck">-->
+<!--              <el-select v-model="form.expirationDateCheck" placeholder="请选择是否检测效期" style="width: 100%">-->
+<!--                <el-option-->
+<!--                  v-for="dict in dict.type.sys_yes_no"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="有效期(天)" prop="shelflife">-->
+<!--              <el-input v-model="form.shelflife" placeholder="请输入有效期(天)" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="是否允许超收" prop="overchargeCheck">-->
+<!--              <el-select v-model="form.overchargeCheck" placeholder="请选择是否允许超收" style="width: 100%">-->
+<!--                <el-option-->
+<!--                  v-for="dict in dict.type.sys_yes_no"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="是否需要质检" prop="qcCheck">-->
+<!--              <el-select v-model="form.qcCheck" placeholder="请选择是否需要质检" style="width: 100%">-->
+<!--                <el-option-->
+<!--                  v-for="dict in dict.type.sys_yes_no"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="是否激活" prop="activeFlag">
-              <el-select v-model="form.activeFlag" placeholder="请选择是否激活" style="width: 100%">
-                <el-option
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-          </el-col>
         </el-row>
         <!--<el-row>
           <el-col :span="12">
@@ -396,9 +399,7 @@
         <el-form-item label="生产企业" prop="manufacturer">
           <el-input v-model="form.manufacturer" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>-->
+        -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

ruoyi-ui/src/views/wms/box/index.vue

@@ -30,8 +30,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否有货" prop="isEmpty">
-        <el-select v-model="queryParams.isEmpty" placeholder="请选择是否有货" clearable size="small">
+      <el-form-item label="是否空" prop="isEmpty">
+        <el-select v-model="queryParams.isEmpty" placeholder="请选择是否空" clearable size="small">
           <el-option
             v-for="dict in dict.type.sys_yes_no"
             :key="dict.value"
@@ -126,7 +126,7 @@
           <dict-tag :options="dict.type.active_state" :value="scope.row.boxState"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否有货" align="center" prop="isEmpty">
+      <el-table-column label="是否空" align="center" prop="isEmpty">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isEmpty"/>
         </template>

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -330,7 +330,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_sku_type skt on sk.sku_type = skt.item_code
         left join (select dict_label,dict_value from sys_dict_data where dict_type = 'ams_inv_quality') lot05_dict on att.lotatt05 = lot05_dict.dict_value
         left join (select * from base_supplier) supp on att.lotatt06 = supp.supplier_id
-        left join wms_box_info w on inv.location_id = w.location_id
+        left join (SELECT * from wms_box_info where location_id !='900') w on inv.location_id = w.location_id
         <where>
             <if test="zoneId != null  and zoneId != ''"> and b.zone_id = #{zoneId}</if>
             <if test="sku != null  and sku != ''"> and (sk.sku like concat('%', #{sku}, '%') or sk.desc1 like concat('%', #{sku}, '%'))</if>

warewms-ams/src/main/resources/mapper/docAsn/WmsDocAsnHeaderMapper.xml

@@ -453,12 +453,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         att.*
         FROM inv_lot_loc_id inv
         Left JOIN inv_lot_att att on inv.lotnum = att.lotnum
-        LEFT JOIN wms_box_info w ON inv.location_id = w.location_id
         LEFT JOIN base_sku sk ON inv.sku = sk.sku
         LEFT JOIN base_sku_type skt ON sk.sku_type = skt.item_code
         <where>
-            (w.box_no = #{palletNo} or att.lotatt07 = #{palletNo})
-            and att.lotatt02 = #{sku}
+            <if test="palletNo != null  and palletNo != ''"> att.lotatt07 = #{palletNo}</if>
+            <if test="sku != null  and sku != ''"> and att.lotatt02 = #{sku}</if>
         </where>
     </select>