fix(package): 修复结构化包装订单中的供应商ID设置和状态更新逻辑

- 移除订单项中的供应商ID设置避免数据冗余
- 简化交付订单状态更新逻辑移除不必要的条件判断
- 优化二维码主记录的流程阶段更新确保正确标记入库状态
- 统一处理二维码扫描用户的更新逻辑

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java

@@ -389,7 +389,6 @@ public class StructuralPackageOrderController extends BaseController {
                                         .setPackagingType((short) 0)
                                         .setQuantity(BigDecimal.valueOf(it.getNum()))
                                         .setUnit(it.getUnit())
-                                        .setSupplierId(it.getSupplierId())
                                         .setPoNumber(it.getExternalOrderNo())
                                         .setPoLineNumber(it.getRowNo())
                                         .setExtendId(it.getId())
@@ -1205,15 +1204,14 @@ public class StructuralPackageOrderController extends BaseController {
         List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(request.getId());
         items.forEach(it -> it.setStoreNum(it.getShipmentNum()));
         structuralPackageOrderTrayItemService.updateBatchById(items);
-        if (structuralPackageDeliverOrderService.updateStateByOrderId(request.getId()) == 2) {
-            qrCodeMasterService.lambdaUpdate()
-                    .set(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState())
-                    .set(WmsQrCodeMaster::getLastScanBy, UserUtil.getUserId())
-                    .set(WmsQrCodeMaster::getLastScanByname, UserUtil.getUserName())
-                    .set(WmsQrCodeMaster::getLastScanTime, LocalDateTime.now())
-                    .eq(WmsQrCodeMaster::getExtendId, request.getId())
-                    .update();
-        }
+        structuralPackageDeliverOrderService.updateStateByOrderId(request.getId());
+        qrCodeMasterService.lambdaUpdate()
+                .set(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState())
+                .set(WmsQrCodeMaster::getLastScanBy, UserUtil.getUserId())
+                .set(WmsQrCodeMaster::getLastScanByname, UserUtil.getUserName())
+                .set(WmsQrCodeMaster::getLastScanTime, LocalDateTime.now())
+                .eq(WmsQrCodeMaster::getExtendId, request.getId())
+                .update();
         WmsStructuralPackageDeliverOrderMap om = structuralPackageDeliverOrderMapService.lambdaQuery()
                 .eq(WmsStructuralPackageDeliverOrderMap::getOrderId, request.getId())
                 .one();