Merge remote-tracking branch 'origin/dev' into _update/bug

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/component/impl/WarehouseBillsfilterServiceImpl.java

@@ -115,9 +115,6 @@ public class WarehouseBillsfilterServiceImpl implements WarehouseBillsfilterServ
             if (StringUtils.isEmpty(li.getfMarks())) {
                 throw new WarehouseException("序号" + line + "明细仓储明细未选择货物详情");
             }
-            if (StringUtils.isEmpty(li.getfCntrno())) {
-                throw new WarehouseException("序号" + line + "明细仓储明细未选择箱号");
-            }
             if (StringUtils.isNull(li.getfQty()) || Objects.equals(li.getfQty(), 0L)) {
                 throw new WarehouseException("序号" + line + "明细仓储明细未选填入数量");
             }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -7012,6 +7012,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         warehousebillsDTO.setfDateChanged(DateUtils.getTimestamp(new Date()).toString() + (int) (Math.random() * 900) + 100);
         warehousebillsDTO.setCreateTime(new Date());
+        warehousebillsDTO.setfBillingway(2L);
         warehousebillsDTO.setCreateBy(loginUser.getUsername());
         warehousebillsDTO.setfBsdeptid(loginUser.getUser().getDeptId());
         warehousebillsDTO.setfChargedate(warehousebillsDTO.getfBsdate());
@@ -7034,7 +7035,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             if (li.getfBsdate().after(new Date())) {
                 throw new WarehouseException("业务日期不得超出当前日期");
             }
-            li.setfBillingway(2L);
             li.setfPid(warehousebillsDTO.getfId());
             li.setfBillstatus(40L);
             li.setfBillno(warehousebillsDTO.getfBillno());