强制rfid

src/main/java/com/sy/coinage/workshop/req/WorkshopOutboundReq.java

@@ -49,7 +49,7 @@ public class WorkshopOutboundReq implements Serializable {
     private List<@Valid SerialNumberVO> autoLs;
 
     @ApiModelProperty(value = "手动录入rfid列表")
-    private List<SerialNumberVO> manualLs;
+    private List<@Valid SerialNumberVO> manualLs;
 
     // 内部出库参数
 

src/main/java/com/sy/coinage/workshop/service/impl/WorkshopOutboundServiceImpl.java

@@ -116,7 +116,7 @@ public class WorkshopOutboundServiceImpl extends ServiceImpl<WorkshopOutboundDao
         if (req.getManualLs() != null && req.getManualLs().size() > 0) {
             racketNum = racketNum + req.getManualLs().size();
             for (SerialNumberVO vo : req.getManualLs()) {
-                BaseInfo info = this.baseInfoService.updateWorkShopStatus(vo.getSerialNumber(), null, 2, 13, null, null, null, null);
+                BaseInfo info = this.baseInfoService.updateWorkShopStatus(vo.getSerialNumber(), vo.getRfid(), 2, 13, null, null, null, null);
                 // 生命周期状态:1初始登记 2:车间入库 3:车间出库 4:总库入库 5:主库抽检出库 6.车间抽检入库确认
                 // 7.车间抽检出库8 主库抽检返回确认 9返检总库出库 10:返检车间确认 11拆包 12：已发货 13:返回机台
                 // FIXME 记录物流信息日志表
@@ -265,7 +265,7 @@ public class WorkshopOutboundServiceImpl extends ServiceImpl<WorkshopOutboundDao
         // 录入手动拍数
         if (req.getManualLs() != null && req.getManualLs().size() > 0) {
             for (SerialNumberVO vo : req.getManualLs()) {
-                BaseInfo info = baseAdd(vo.getSerialNumber(), null, model, req, wareId);
+                BaseInfo info = baseAdd(vo.getSerialNumber(), vo.getRfid(), model, req, wareId);
                 outboundVO.setTotalBoxAmount(outboundVO.getTotalBoxAmount() + info.getQty());
 //                if ((info.getUnpackageStatus() != null && info.getUnpackageStatus().intValue() == 2) ||
 //                        info.getOriginType() == 2) {

src/main/java/com/sy/coinage/workshop/service/impl/WorkshopTransferServiceImpl.java

@@ -172,11 +172,12 @@ public class WorkshopTransferServiceImpl extends ServiceImpl<WorkshopTransferDao
         if (req.getManualLs() != null && req.getManualLs().size() > 0) {
             for (SerialNumberVO vo : req.getManualLs()) {
                 // 验证库位状态
-                BaseInfo b = this.baseInfoService.getBySerialNumber(vo.getSerialNumber(), 2);
+                BaseInfo b = this.baseInfoService.getByRfid(vo.getRfid(), 2);
+//                BaseInfo b = this.baseInfoService.getBySerialNumber(vo.getSerialNumber(), 2);
                 if (b.getLocAreaId() == null || b.getLocAreaId().intValue() != 2) {
                     throw new RetException("库位状态异常，不能出库，请先内部移库");
                 }
-                BaseInfo info = this.addDetail(model, vo.getSerialNumber(), null, product, req.getWareId(), now);
+                BaseInfo info = this.addDetail(model, vo.getSerialNumber(), vo.getRfid(), product, req.getWareId(), now);
                 if ((info.getUnpackageStatus() != null && info.getUnpackageStatus().intValue() == 2) ||
                         info.getOriginType() == 2) {
                     outboundVO.setBoxQty(outboundVO.getBoxQty() + info.getQty());