Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java

@@ -233,8 +233,8 @@ public class QcPDAController {
      * @return
      */
     @GetMapping("/getUnqualifiedRecordList")
-    public List<QcUnqualifiedRecordVo> getUnqualifiedRecordList(QcUnqualifiedRecordBo bo) {
+    public R<List<QcUnqualifiedRecordVo>> getUnqualifiedRecordList(QcUnqualifiedRecordBo bo) {
-        return qcUnqualifiedRecordService.queryList(bo);
+        return R.ok(qcUnqualifiedRecordService.queryList(bo));
     }
 
     /**

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java

@@ -7,6 +7,7 @@ import org.dromara.wms.domain.*;
 import org.dromara.wms.domain.bo.WmsReturnOrderBo;
 import org.dromara.wms.domain.vo.*;
 import org.dromara.wms.service.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -99,8 +100,6 @@ public class WmsPdaApiController extends BaseController {
     public R<Void> rawSelectInVentoryByBatchCode(WmsOutstockRecord outstockRecord) {
         // 验证库存
         WmsInventory wmsInventory = apiService.outSelectInVentoryByBatch(outstockRecord);
-
-
         // WmsInventoryVo wmsInventoryVo=apiService.selectInVentoryByBatchCode(outstockRecord.getBatchCode(),outstockRecord.getLocationCode());
         if (wmsInventory == null) {
             R.fail("物料不在待出库列表内");
@@ -112,6 +111,24 @@ public class WmsPdaApiController extends BaseController {
         Boolean result = apiService.rawOutSubmit(outstockRecord, wmsInventory);
         return result ? R.ok() : R.fail();
     }
+    /**
+     * 特殊出库提交
+     */
+    @PostMapping("/raw/specialOutSubmit")
+    public R<Void> specialOutSubmit(@RequestBody WmsOutstockRecord outstockRecord) {
+        // 验证库存
+        WmsInventoryVo WmsInventoryVo=apiService.selectInVentoryByBatchCode(outstockRecord.getBatchCode(),outstockRecord.getLocationCode());
+        if (WmsInventoryVo == null) {
+            R.fail("条码扫描错误");
+        }
+        if (WmsInventoryVo.getInventoryQty().compareTo(outstockRecord.getOutstockQty()) < 0) {
+            R.fail("无法出库，当前库位库存为：" + WmsInventoryVo.getInventoryQty());
+        }
+        WmsInventory wmsInventory=new WmsInventory();
+        BeanUtils.copyProperties(WmsInventoryVo, wmsInventory);
+        Boolean result = apiService.specialOutSubmit(outstockRecord, wmsInventory);
+        return result ? R.ok() : R.fail();
+    }
 
     @PostMapping("/product/selectVehicle")
     public R<BaseToolingInfo> productBindSelectVehicle(String code) {

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java

@@ -37,7 +37,7 @@ public interface IWmsPdaApiService {
     Boolean shiftChangeSubmit(ShiftChange shiftChange);
 
     Boolean rawOutSubmit(WmsOutstockRecord outstockRecord, WmsInventory wmsInventoryVo);
-
+    Boolean specialOutSubmit(WmsOutstockRecord outstockRecord, WmsInventory wmsInventory);
     WmsInventory outSelectInVentoryByBatch(WmsOutstockRecord outstockRecord);
 
     List<StoreInfoVo> selectStoreInfo(String type);

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java

@@ -245,8 +245,21 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
         return i > 0;
     }
 
+    /**
+     * 出库提交
+     * @param outstockRecord 数据
+     * @param wmsInventory 库存
+     * @return
+     */
     @Override
     public Boolean rawOutSubmit(WmsOutstockRecord outstockRecord, WmsInventory wmsInventory) {
+        outStoreOperation(outstockRecord, wmsInventory);
+        // 修改子表出库数量
+        wmsOutstockDetailMapper.updateOutNumberByObjId(wmsInventory.getOutstockDetailId(), outstockRecord.getOutstockQty());
+        return null;
+    }
+    // 出库操作
+    private void outStoreOperation(WmsOutstockRecord outstockRecord, WmsInventory wmsInventory) {
         // 出库数量
         BigDecimal outstockQty = outstockRecord.getOutstockQty();
         // 库存
@@ -265,10 +278,18 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
         outstockRecord.setCreateBy(LoginHelper.getUserId());
         outstockRecord.setCreateTime(DateUtils.getNowDate());
         wmsOutstockRecordMapper.insert(outstockRecord);
-        // 修改子表出库数量
+    }
-        wmsOutstockDetailMapper.updateOutNumberByObjId(wmsInventory.getOutstockDetailId(), outstockRecord.getOutstockQty());
-
 
+    /**
+     * 特殊出库提交 少了子表操作
+     * @param outstockRecord
+     * @param wmsInventory
+     * @return
+     */
+    @Override
+    public Boolean specialOutSubmit(WmsOutstockRecord outstockRecord, WmsInventory wmsInventory) {
+        // 出库数量
+        outStoreOperation(outstockRecord, wmsInventory);
         return null;
     }