diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index 1c593eeb..9a57395d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -624,8 +624,9 @@ public class VoucherServiceImpl extends ServiceImpl queryNotificationVoucherPopupInfo(VoucherPagination voucherPagination) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("b.product_id",voucherPagination.getProductId()); + queryWrapper.eq("a.voucher_status","4"); queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList()); -// queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList()); + queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList()); queryWrapper.isNull("a.f_delete_mark"); Page page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize()); IPage voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java index 6df88690..26758a56 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java @@ -475,9 +475,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl ageMap = new HashMap<>(); +// for (WarehousingStoragePoundlistModel poundlistModel : form.getWarehousingStoragePoundlistList()) { +// String productId = poundlistModel.getProductId(); +// String unit = poundlistModel.getUnit(); +// +// BigDecimal NetWeight = poundlistModel.getNetWeight(); +// int age = user.getAge(); +// +// if (ageMap.containsKey(name)) { +// ageMap.put(name, ageMap.get(name) + age); +// } else { +// ageMap.put(name, age); +// } +// } + //主表字段验证 //子表字段验证 - if (form.getWarehousingStoragePoundlistList().size()>form.getWarehousingStorageProductList().size()){ - return "凭证条数不能大于商品条数"; - } + //多凭证按照商品id合并 +// for (WarehousingStoragePoundlistModel warehousingStoragePoundlistModel : form.getWarehousingStoragePoundlistList()) { +// warehousingStorageProductModel +// } + + BigDecimal maxNum = BigDecimal.ZERO; - BigDecimal YNum = BigDecimal.ZERO; BigDecimal netWeightNum = BigDecimal.ZERO; for (WarehousingStorageProductModel warehousingStorageProductModel : form.getWarehousingStorageProductList()) { maxNum = maxNum.add( new BigDecimal(warehousingStorageProductModel.getStorageNumber())) ; -// YNum = YNum.add( new BigDecimal(warehousingStorageProductModel.getReceivedQuantity())) ; } for (WarehousingStoragePoundlistModel warehousingStoragePoundlistModel : form.getWarehousingStoragePoundlistList()) { netWeightNum = netWeightNum.add( warehousingStoragePoundlistModel.getNetWeight()) ; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingInventoryController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingInventoryController.java index f6b28b67..5b8f64cc 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingInventoryController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingInventoryController.java @@ -402,6 +402,8 @@ public class WarehousingInventoryController { //生成入库单 WarehousingStorageForm warehousingStorageForm=new WarehousingStorageForm(); warehousingStorageForm.setWarehousingStorageType("4"); //盘盈入库 + warehousingStorageForm.setWarehousingStorageStatus("3"); //已入库 + warehousingStorageForm.setRemark("盘盈入库"); warehousingStorageForm.setWarehousingId(warehousingInventoryForm.getId()); warehousingStorageForm.setWarehouseId(warehousingInventoryForm.getWarehouseId()); List list =new ArrayList<>(); @@ -468,6 +470,8 @@ public class WarehousingInventoryController { warehousingOutboundForm.setWarehousingOutboundType("5"); warehousingOutboundForm.setWarehousingId(entity.getId()); warehousingOutboundForm.setWarehouseId(entity.getWarehouseId()); + warehousingOutboundForm.setWarehousingOutboundStatus("3"); + warehousingOutboundForm.setOutboundReason("盘亏出库"); List warehousingOutboundProductModelList =new ArrayList<>(); for (WarehousingInventoryProductModel warehousingInventoryProductModel:warehousingInventoryForm.getWarehousingInventoryProductList()){ BigDecimal negative = new BigDecimal(warehousingInventoryProductModel.getProfitAndLossQuantity()); @@ -481,6 +485,7 @@ public class WarehousingInventoryController { warehousingOutboundProductModel.setOutboundUnit(warehousingInventoryProductModel.getInventoryUnitIds()); warehousingOutboundProductModel.setOutboundNumber(warehousingInventoryProductModel.getProfitAndLossQuantity()); //盘亏数量=出库数量 warehousingOutboundProductModel.setReceivedQuantity(warehousingInventoryProductModel.getProfitAndLossQuantity());//盘亏数量=已出库数量 + warehousingOutboundProductModel.setBatchNumber(warehousingInventoryProductModel.getBatchNumber()); warehousingOutboundProductModelList.add(warehousingOutboundProductModel); warehousingOutboundForm.setWarehousingOutboundProductList(warehousingOutboundProductModelList); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java index 88f822e3..45baef02 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java @@ -145,12 +145,6 @@ public class WarehousingNotificationController { for (WarehousingProductEntity warehousingProductEntity:warehousingProductList){ warehousingProductEntity.setStorageNumber(warehousingProductEntity.getPurchaseNum()); warehousingProductEntity.setStorageUnit(warehousingProductEntity.getPurchaseUnitId()); -// QueryWrapper businessCargoEntityQueryWrapper =new QueryWrapper<>(); -// businessCargoEntityQueryWrapper.lambda().eq(BusinessCargoEntity::getId,warehousingProductEntity.getStorageAreaId()); -// List businessCargoEntityList =businessCargoService.list(businessCargoEntityQueryWrapper); -// if (businessCargoEntityList.size()>0 && businessCargoEntityList!=null){ -// warehousingProductEntity.setStorageAreaId(businessCargoEntityList.get(0).getCargoName()); -// } } warehousingNotificationMap.put("tableField121",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(warehousingProductList))); realList.add(warehousingNotificationMap); @@ -664,8 +658,6 @@ public class WarehousingNotificationController { @Operation(summary = "获取Notification选择的凭证和商品列表") @PostMapping("/getNotificationVoucherProductList") public ActionResult queryNotificationVoucherProductList(@RequestBody VoucherPagination voucherPagination) throws IOException{ -// WarehousingNotificationEntity warehousingNotificationEntity= warehousingNotificationService.getInfo(voucherPagination.getId()); - String id = voucherPagination.getNotid(); QueryWrapper warehousingProductEntityQueryWrapper=new QueryWrapper<>(); warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id); @@ -673,16 +665,11 @@ public class WarehousingNotificationController { List list=new ArrayList<>(); for (WarehousingProductEntity warehousingProductEntity:warehousingProductEntityList){ -// QueryWrapper voucherEntityQueryWrapper=new QueryWrapper<>(); -// VoucherPagination voucherPagination =new VoucherPagination(); voucherPagination.setProductId(warehousingProductEntity.getProductId()); List voucherList= voucherService.queryNotificationVoucherPopupInfo(voucherPagination); list.addAll(voucherList); } -// List productWarehouseEntityList=workOrderService.getWorkBomProduct(voucherEntity.getId()); -// voucherEntity.setProductWarehouseEntityList(productWarehouseEntityList); - //返回对象 PageListVO vo = new PageListVO(); vo.setList(list); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java index c18ae568..023b4dfe 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java @@ -92,6 +92,16 @@ public class WarehousingOutboundController { private InventoryService inventoryService; @Autowired private ConfigValueUtil configValueUtil; + @Autowired + private BusinessOrderService businessOrderService; + @Autowired + private WarehousingReceiveService warehousingReceiveService; + @Autowired + private WarehousingInventoryService warehousingInventoryService; + @Autowired + private WarehousingReportlossService warehousingReportlossService; + @Autowired + private DeliveryOrderService deliveryOrderService; /** * 列表 @@ -105,8 +115,66 @@ public class WarehousingOutboundController { List list= warehousingOutboundService.getList(warehousingOutboundPagination); List> realList=new ArrayList<>(); for (WarehousingOutboundEntity entity : list) { + if (entity.getWarehousingOutboundType().equals("1")){ + //销售出库 + BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getWarehousingId()); + if (businessOrderEntity!=null){ + entity.setBusinessCode(businessOrderEntity.getCode()); + } + }else if (entity.getWarehousingOutboundType().equals("2")){ + //调拨出库 + }else if (entity.getWarehousingOutboundType().equals("3")){ + //退供出库 +// WarehousingNotificationEntity warehousingNotificationEntity =warehousingNotificationService.getInfo(entity.getWarehousingId()); +// if (warehousingNotificationEntity!=null){ +// ReceiptOrderEntity receiptOrderEntity = receiptOrderService.getInfo(warehousingNotificationEntity.getBusinessId()); +// entity.setBusinessCode(receiptOrderEntity.getReceiptCode()); +// } + + }else if (entity.getWarehousingOutboundType().equals("4")){ + //领用出库 + WarehousingReceiveEntity warehousingReceiveEntity = warehousingReceiveService.getInfo(entity.getWarehousingId()); + if (warehousingReceiveEntity!=null){ + entity.setBusinessCode(warehousingReceiveEntity.getReceiveCode()); + } + }else if (entity.getWarehousingOutboundType().equals("5")){ + //盘亏出库 + WarehousingInventoryEntity warehousingInventoryEntity = warehousingInventoryService.getInfo(entity.getWarehousingId()); + if (warehousingInventoryEntity!=null){ + entity.setBusinessCode(warehousingInventoryEntity.getDocumentNo()); + } + + }else if (entity.getWarehousingOutboundType().equals("6")){ + //报损出库 + WarehousingReportlossEntity warehousingReportlossEntity = warehousingReportlossService.getInfo(entity.getWarehousingId()); + if (warehousingReportlossEntity!=null){ + entity.setBusinessCode(warehousingReportlossEntity.getReportlossCode()); + } + }else if (entity.getWarehousingOutboundType().equals("7")){ + //其他出库 + }else if (entity.getWarehousingOutboundType().equals("8")){ + //差异调整出库 + }else if (entity.getWarehousingOutboundType().equals("9")){ + //库存初始化 + }else if (entity.getWarehousingOutboundType().equals("10")){ + //货权转移出库 + }else if (entity.getWarehousingOutboundType().equals("11")){ + //采购发货单出库 + DeliveryOrderEntity deliveryOrderEntity =deliveryOrderService.getInfo(entity.getWarehousingId()); + if (deliveryOrderEntity!=null){ + entity.setBusinessCode(deliveryOrderEntity.getDeliveryCode()); + } + }else if (entity.getWarehousingOutboundType().equals("12")){ + //销售发货单出库 + DeliveryOrderEntity deliveryOrderEntity =deliveryOrderService.getInfo(entity.getWarehousingId()); + if (deliveryOrderEntity!=null){ + entity.setBusinessCode(deliveryOrderEntity.getDeliveryCode()); + } + } + entity.setOutNumber(warehousingOutboundService.queryOutboundNumber(entity.getId())); - entity.setSalesNo(warehousingOutboundService.querySalesNo(entity.getId())); + entity.setSalesNo(warehousingOutboundService.querySalesNo(entity.getId())) + ; Map warehousingOutboundMap=JsonUtil.entityToMap(entity); warehousingOutboundMap.put("id", warehousingOutboundMap.get("id")); //副表数据 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java index 6d829f22..c0fbc1aa 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java @@ -417,7 +417,7 @@ public class WarehousingReceiveController { receiveWrapper.lambda().eq(WarehousingReceiveEntity::getBusinessId, id); List warehousingReceiveEntityList = warehousingReceiveService.list(receiveWrapper); warehousingOutboundForm.setWarehousingOutboundType("4"); //领用出库 - warehousingOutboundForm.setWarehousingOutboundStatus("4"); //已出库 + warehousingOutboundForm.setWarehousingOutboundStatus("3"); //已出库 warehousingOutboundForm.setOutboundReason("领用单生成出出库单"); warehousingOutboundForm.setWarehousingId(warehousingReceiveEntityList.get(0).getId()); warehousingOutboundForm.setWarehouseId(warehousingReceiveForm.getWarehouseId()); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java index c4c4585b..a6375f88 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java @@ -413,7 +413,7 @@ public class WarehousingReportlossController { //出库单 WarehousingOutboundForm warehousingOutboundForm=new WarehousingOutboundForm(); warehousingOutboundForm.setWarehousingOutboundType("6"); - warehousingOutboundForm.setWarehousingOutboundStatus("4"); + warehousingOutboundForm.setWarehousingOutboundStatus("3"); warehousingOutboundForm.setWarehousingId(entity.getId()); warehousingOutboundForm.setWarehouseId(entity.getWarehouseId()); List warehousingOutboundProductModelList =new ArrayList<>(); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java index 2a613f8e..8c844838 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java @@ -444,6 +444,9 @@ public class WarehousingReturnController { warehousingStorageFormRenturn.setWarehousingStorageType("7"); warehousingStorageFormRenturn.setWarehousingId(entity.getId()); warehousingStorageFormRenturn.setWarehouseId(entity.getWarehouseId()); + warehousingStorageFormRenturn.setRemark("返库单生成的入库单"); + warehousingStorageFormRenturn.setWarehousingStorageStatus("3"); + List list1 =new ArrayList<>(); for (WarehousingReturnProductModel warehousingReturnProductModel:warehousingReturnForm.getWarehousingReturnProductList()){ WarehousingStorageProductModel warehousingStorageProductModel=new WarehousingStorageProductModel(); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java index cae1df03..f8227dfc 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java @@ -96,6 +96,13 @@ public class WarehousingStorageController { @Autowired private BusinessOrderService businessOrderService; @Autowired + private WarehousingInventoryService warehousingInventoryService; + + @Autowired + private WarehousingReturnService warehousingReturnService; + @Autowired + private ReceiptOrderService receiptOrderService; + @Autowired private WorkOrderService workOrderService; /** @@ -113,9 +120,9 @@ public class WarehousingStorageController { if (entity.getWarehousingStorageType().equals("1")){ //采购入库 - BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getWarehousingId()); - if (businessOrderEntity!=null){ - entity.setBusinessCode(businessOrderEntity.getCode()); + WarehousingNotificationEntity warehousingNotificationEntity = warehousingNotificationService.getInfo(entity.getWarehousingId()); + if (warehousingNotificationEntity!=null){ + entity.setBusinessCode(warehousingNotificationEntity.getWarehousingCode()); } }else if (entity.getWarehousingStorageType().equals("2")){ //调拨入库 @@ -125,20 +132,49 @@ public class WarehousingStorageController { // } }else if (entity.getWarehousingStorageType().equals("3")){ //退货入库 + WarehousingNotificationEntity warehousingNotificationEntity =warehousingNotificationService.getInfo(entity.getWarehousingId()); + + if (warehousingNotificationEntity!=null){ + ReceiptOrderEntity receiptOrderEntity = receiptOrderService.getInfo(warehousingNotificationEntity.getBusinessId()); + if (receiptOrderEntity!=null){ + entity.setBusinessCode(receiptOrderEntity.getReceiptCode()); + } + } + }else if (entity.getWarehousingStorageType().equals("4")){ //盘盈入库 + WarehousingInventoryEntity warehousingInventoryEntity = warehousingInventoryService.getInfo(entity.getWarehousingId()); + if (warehousingInventoryEntity!=null){ + entity.setBusinessCode(warehousingInventoryEntity.getDocumentNo()); + } + }else if (entity.getWarehousingStorageType().equals("5")){ //其他入库 }else if (entity.getWarehousingStorageType().equals("6")){ //差异调整入库 }else if (entity.getWarehousingStorageType().equals("7")){ //领用返入库 + WarehousingReturnEntity warehousingReturnEntity = warehousingReturnService.getInfo(entity.getWarehousingId()); + if (warehousingReturnEntity!=null){ + entity.setBusinessCode(warehousingReturnEntity.getReturnCode()); + } + }else if (entity.getWarehousingStorageType().equals("8")){ + //货权转移入库 }else if (entity.getWarehousingStorageType().equals("9")){ //加工入库 WorkOrderEntity workOrderEntity = workOrderService.getInfo(entity.getWarehousingId()); - entity.setBusinessCode(workOrderEntity.getCode()); + if (workOrderEntity!=null){ + entity.setBusinessCode(workOrderEntity.getCode()); + } + }else if (entity.getWarehousingStorageType().equals("15")){ + //采购收货单 + ReceiptOrderEntity receiptOrderEntity = receiptOrderService.getInfo(entity.getWarehousingId()); + if (receiptOrderEntity!=null){ + entity.setBusinessCode(receiptOrderEntity.getReceiptCode()); + } + } @@ -201,7 +237,7 @@ public class WarehousingStorageController { return ActionResult.fail(b ); } try{ - warehousingStorageService.saveOrUpdate(warehousingStorageForm, id ,true); +// warehousingStorageService.saveOrUpdate(warehousingStorageForm, id ,true); FlowTaskEntity flowTaskEntity = flowTaskService.getById(id); if (flowTaskEntity!=null||flowTaskEntity==null){ //添加一个是否在审核的判断 @@ -224,7 +260,9 @@ public class WarehousingStorageController { // }else { // warehousingNotificationEntity.setWarehousingStatus("3"); // } - warehousingNotificationService.saveOrUpdate(warehousingNotificationEntity); + + //先注释 +// warehousingNotificationService.saveOrUpdate(warehousingNotificationEntity); } }catch(Exception e){ @@ -483,41 +521,51 @@ public class WarehousingStorageController { try{ warehousingStorageService.saveOrUpdate(warehousingStorageForm,id,false); FlowTaskEntity flowTaskEntity = flowTaskService.getById(id); - if (flowTaskEntity!=null){ - - QueryWrapper flowTaskNodeEntityQueryWrapper = new QueryWrapper<>(); - //flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getState, flowTaskEntity.getThisStepId()); - flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId()); - flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId()); - List flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper); - if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) { - //审核通过修改入库通知 - WarehousingNotificationEntity warehousingNotificationEntity =warehousingNotificationService.getInfo(warehousingStorageForm.getWarehousingId()); - if (warehousingNotificationEntity!=null){ - BigDecimal maxNum = BigDecimal.ZERO; - BigDecimal YNum = BigDecimal.ZERO; - BigDecimal netWeightNum = BigDecimal.ZERO; - for (WarehousingStorageProductModel warehousingStorageProductModel : warehousingStorageForm.getWarehousingStorageProductList()) { - maxNum = maxNum.add( new BigDecimal(warehousingStorageProductModel.getStorageNumber())) ; - if (warehousingStorageProductModel.getReceivedQuantity()!=null){ - maxNum = maxNum.add( new BigDecimal(warehousingStorageProductModel.getReceivedQuantity())) ; - }else { - maxNum = maxNum.add( new BigDecimal(0)) ; - } + if (flowTaskEntity!=null) { - } - for (WarehousingStoragePoundlistModel warehousingStoragePoundlistModel : warehousingStorageForm.getWarehousingStoragePoundlistList()) { - netWeightNum = netWeightNum.add( warehousingStoragePoundlistModel.getNetWeight()) ; - } - BigDecimal result = maxNum.subtract(YNum); - result = result.subtract(netWeightNum); - if (result.compareTo(BigDecimal.ZERO)==0){ - warehousingNotificationEntity.setWarehousingStatus("4"); - }else { - warehousingNotificationEntity.setWarehousingStatus("3"); - } + QueryWrapper flowTaskNodeEntityQueryWrapper = new QueryWrapper<>(); + //flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getState, flowTaskEntity.getThisStepId()); + flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId()); + flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId()); + List flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper); + if (flowTaskNodeEntityList != null && flowTaskNodeEntityList.size() > 0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) { + //审核通过修改入库通知 + WarehousingNotificationEntity warehousingNotificationEntity = warehousingNotificationService.getInfo(warehousingStorageForm.getWarehousingId()); +// if (warehousingNotificationEntity!=null){ +// BigDecimal maxNum = BigDecimal.ZERO; +// BigDecimal YNum = BigDecimal.ZERO; +// BigDecimal netWeightNum = BigDecimal.ZERO; +// for (WarehousingStorageProductModel warehousingStorageProductModel : warehousingStorageForm.getWarehousingStorageProductList()) { +// maxNum = maxNum.add( new BigDecimal(warehousingStorageProductModel.getStorageNumber())) ;//这次的入库数量 +// if (warehousingStorageProductModel.getReceivedQuantity()!=null){ +// maxNum = maxNum.add( new BigDecimal(warehousingStorageProductModel.getReceivedQuantity())) ; +// }else { +// maxNum = maxNum.add( new BigDecimal(0)) ; +// } +// +// } +// for (WarehousingStoragePoundlistModel warehousingStoragePoundlistModel : warehousingStorageForm.getWarehousingStoragePoundlistList()) { +// netWeightNum = netWeightNum.add( warehousingStoragePoundlistModel.getNetWeight()) ; +// } +// BigDecimal netWeightNumNot= netWeightNum; //这次的入库数量 +// if (warehousingNotificationEntity.getConfirmWarehousingNum()!=null){ +// YNum.add(new BigDecimal (warehousingNotificationEntity.getConfirmWarehousingNum())); +// } +// BigDecimal maxNums = maxNum; //暂存 +// BigDecimal result = maxNum.subtract(YNum); // +// result = result.subtract(netWeightNum); //最后结果 +// +// +// +// if (result.compareTo(BigDecimal.ZERO)==0){ +// warehousingNotificationEntity.setWarehousingStatus("4"); +// }else { +// warehousingNotificationEntity.setWarehousingStatus("3"); +//// warehousingNotificationEntity.setNotificationStorageNumber(); +// } + //上面注释是多次入库，现在先弄成一次性入库 + warehousingNotificationEntity.setWarehousingStatus("4"); warehousingNotificationEntity.setIsFlow(1); - warehousingNotificationService.saveOrUpdate(warehousingNotificationEntity); } @@ -579,7 +627,7 @@ public class WarehousingStorageController { } } - } + }catch(Exception e){ return ActionResult.fail("修改数据失败"); } @@ -697,4 +745,5 @@ public class WarehousingStorageController { List list= warehousingStorageService.getWarehousingstorageoutboundPoundlist(warehousingStoragePagination); return ActionResult.success(list); } + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java index e540962d..77e749f4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java @@ -1161,7 +1161,8 @@ public class WorkOrderController { //成品生成入库单 WarehousingStorageForm warehousingStorageForm=new WarehousingStorageForm(); warehousingStorageForm.setWarehousingStorageType("9"); - warehousingStorageForm.setWarehousingStorageStatus("4"); + warehousingStorageForm.setWarehousingStorageStatus("3"); + warehousingStorageForm.setRemark("加工成品入库"); warehousingStorageForm.setWarehousingId(workOrderForm.getId()); warehousingStorageForm.setWarehouseId(workOrderForm.getWarehouseId()); List list =new ArrayList<>(); @@ -1285,7 +1286,7 @@ public class WorkOrderController { receiveWrapper.lambda().eq(WarehousingReceiveEntity::getBusinessId, id); List warehousingReceiveEntityList = warehousingReceiveService.list(receiveWrapper); warehousingOutboundForm.setWarehousingOutboundType("4"); //领用出库 - warehousingOutboundForm.setWarehousingOutboundStatus("4"); //已出库 + warehousingOutboundForm.setWarehousingOutboundStatus("3"); //已出库 warehousingOutboundForm.setOutboundReason("加工单——领用单生成出出库单"); warehousingOutboundForm.setWarehousingId(warehousingReceiveEntityList.get(0).getId()); warehousingOutboundForm.setWarehouseId(warehousingReceiveForm.getWarehouseId()); @@ -1410,6 +1411,8 @@ public class WorkOrderController { //返库单再生成入库单 WarehousingStorageForm warehousingStorageFormRenturn=new WarehousingStorageForm(); warehousingStorageFormRenturn.setWarehousingStorageType("7"); + warehousingStorageFormRenturn.setWarehousingStorageStatus("3"); + warehousingStorageFormRenturn.setRemark("返库单生成入库单"); warehousingStorageFormRenturn.setWarehousingId(warehousingReturnEntityList.get(0).getId()); warehousingStorageFormRenturn.setWarehouseId(workOrderForm.getWarehouseId()); List list1 =new ArrayList<>(); @@ -1545,7 +1548,7 @@ public class WorkOrderController { List warehousingReportlossEntityList = warehousingReportlossService.list(reportlossEntityQueryWrapper); warehousingOutboundFormReportloss.setWarehousingOutboundType("6"); - warehousingOutboundFormReportloss.setWarehousingOutboundStatus("4"); + warehousingOutboundFormReportloss.setWarehousingOutboundStatus("3"); warehousingOutboundFormReportloss.setWarehousingId(warehousingReportlossEntityList.get(0).getId()); warehousingOutboundFormReportloss.setWarehouseId(warehousingReceiveForm.getWarehouseId()); warehousingOutboundFormReportloss.setOutboundReason("加工单——报损单生成出出库单"); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundEntity.java index 458a62e8..de921508 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundEntity.java @@ -68,4 +68,6 @@ public class WarehousingOutboundEntity { private String searchDateString; @TableField(exist = false) private String productId; + @TableField(exist = false) //关联单号 + private String businessCode; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingoutbound/WarehousingOutboundConstant.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingoutbound/WarehousingOutboundConstant.java index 2df8bb38..59893b08 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingoutbound/WarehousingOutboundConstant.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingoutbound/WarehousingOutboundConstant.java @@ -21,7 +21,7 @@ public class WarehousingOutboundConstant{ /** 整个表单配置json */ public static final String getFormData(){ StringBuilder sb = new StringBuilder(); - sb.append("{\"popupType\":\"general\",\"idGlobal\":130,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"1000px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1708406275043,\"tableName\":\"jg_warehousing_storage\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"基础信息\",\"helpMessage\":\"\"},{\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"billRule\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"rule\":\"chukudanbianhao\",\"className\":[],\"label\":\"单据编号\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708406291790,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-documents\",\"ruleName\":\"出库单编号\",\"tag\":\"JnpfInput\",\"span\":8},\"readonly\":true,\"__vModel__\":\"documentNo\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"系统自动生成\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单据类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708406384094,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"销售出库\",\"id\":\"1\"},{\"fullName\":\"挑拨出库\",\"id\":\"2\"},{\"fullName\":\"退供出库\",\"id\":\"3\"},{\"fullName\":\"领用出库\",\"id\":\"4\"},{\"fullName\":\"盘亏出库\",\"id\":\"5\"},{\"fullName\":\"报损出库\",\"id\":\"6\"},{\"fullName\":\"其他出库\",\"id\":\"7\"},{\"fullName\":\"差异调整出库\",\"id\":\"8\"},{\"fullName\":\"库存初始化\",\"id\":\"9\"},{\"fullName\":\"货权转移出库\",\"id\":\"10\"}],\"multiple\":false,\"__vModel__\":\"warehousingOutboundType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"通知编号\",\"value\":\"warehousing_code\"},{\"label\":\"供应商\",\"value\":\"subject_basic_id\"},{\"label\":\"仓库\",\"value\":\"warehouse_id\"}],\"templateJson\":[],\"relationField\":\"warehousing_code\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"关联单号\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708406648706,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"warehousingId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529924192531927237\",\"interfaceName\":\"出库单-查询出库通知\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"仓库编号\",\"value\":\"code\"},{\"label\":\"仓库名称\",\"value\":\"name\"},{\"label\":\"仓库简称\",\"value\":\"simple_name\"}],\"templateJson\":[],\"relationField\":\"name\",\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库仓库\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708406959225,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"warehouseId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529617754022498181\",\"interfaceName\":\"入库单-查询仓库\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407215891,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":true,\"tag\":\"JnpfDatePicker\",\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"出库时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"warehousingTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"date\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":128,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库原因\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708480003723,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"outboundReason\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"备注\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407247496,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"remark\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"createTime\",\"defaultValue\":\"\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"创建时间\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407256307,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-createtime\",\"tag\":\"JnpfOpenData\",\"span\":24},\"readonly\":true,\"__vModel__\":\"creatorTime\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"\",\"type\":\"currTime\"},{\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"createUser\",\"defaultValue\":\"\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"创建用户\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407257191,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-founder\",\"tag\":\"JnpfOpenData\",\"span\":24},\"readonly\":true,\"__vModel__\":\"creatorUserId\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"\",\"type\":\"currUser\"},{\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"modifyTime\",\"defaultValue\":\"\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"修改时间\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407258223,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-modifytime\",\"tag\":\"JnpfInput\",\"span\":24},\"readonly\":true,\"__vModel__\":\"lastModifyTime\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"系统自动生成\"},{\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"modifyUser\",\"defaultValue\":\"\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"修改用户\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407258873,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-modifier\",\"tag\":\"JnpfInput\",\"span\":24},\"readonly\":true,\"__vModel__\":\"lastModifyUserId\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"系统自动生成\"},{\"__config__\":{\"formId\":115,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1708407334823,\"tableName\":\"jg_warehousing_storage\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"附件\",\"helpMessage\":\"\"},{\"showSummary\":false,\"actionText\":\"添加\",\"tableConf\":{},\"defaultValue\":[],\"addTableConf\":{\"popupType\":\"dialog\",\"hasPage\":true,\"popupTitle\":\"选择数据\",\"pageSize\":20,\"columnOptions\":[],\"interfaceId\":\"\",\"interfaceName\":\"\",\"relationOptions\":[],\"templateJson\":[],\"popupWidth\":\"800px\"},\"thousands\":false,\"summaryField\":[],\"thousandsField\":[],\"showDeleteBtn\":true,\"addType\":0,\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"table\",\"defaultValue\":[],\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库凭证\",\"type\":\"table\",\"showLabel\":false,\"tableName\":\"jg_warehousing_outbound_poundlist\",\"renderKey\":1708407302476,\"layout\":\"rowFormItem\",\"rowType\":\"table\",\"tagIcon\":\"icon-ym icon-ym-generator-table\",\"children\":[{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"凭证编号\",\"value\":\"voucher_code\"},{\"label\":\"凭证类型\",\"value\":\"voucher_type\"},{\"label\":\"车牌号\",\"value\":\"vehicle_number\"},{\"label\":\"商品名称\",\"value\":\"product_name\"}],\"templateJson\":[],\"relationField\":\"voucher_code\",\"__config__\":{\"formId\":116,\"relationTable\":\"jg_warehousing_outbound_poundlist\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField114\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"关联凭证\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407359407,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"voucherId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529929122277773509\",\"interfaceName\":\"出库单-查询出库凭证\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"}],\"showTitle\":true,\"complexHeaderList\":[],\"tag\":\"JnpfInputTable\",\"componentName\":\"row114\",\"span\":24},\"showAddBtn\":true,\"__vModel__\":\"tableField114\",\"disabled\":false},{\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1708408106860,\"tableName\":\"jg_warehousing_storage\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"商品信息\",\"helpMessage\":\"\"},{\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"text\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"文本\",\"showLabel\":false,\"required\":false,\"renderKey\":1708408126480,\"tableName\":\"jg_warehousing_storage\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-textarea\",\"tag\":\"JnpfText\",\"span\":24},\"textStyle\":{\"color\":\"#000000\",\"font-weight\":\"normal\",\"text-decoration\":\"none\",\"font-size\":12,\"line-height\":32,\"font-style\":\"normal\",\"text-align\":\"left\"},\"content\":\"默认展示关联单据的商品信息，可直接修改商品数量。\"},{\"showSummary\":false,\"actionText\":\"添加\",\"tableConf\":{},\"defaultValue\":[],\"addTableConf\":{\"popupType\":\"dialog\",\"hasPage\":true,\"popupTitle\":\"选择数据\",\"pageSize\":20,\"columnOptions\":[],\"interfaceId\":\"\",\"interfaceName\":\"\",\"relationOptions\":[],\"templateJson\":[],\"popupWidth\":\"800px\"},\"thousands\":false,\"summaryField\":[],\"thousandsField\":[],\"showDeleteBtn\":true,\"addType\":0,\"__config__\":{\"formId\":119,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"table\",\"defaultValue\":[],\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"\",\"type\":\"table\",\"showLabel\":false,\"tableName\":\"jg_warehousing_outbound_product\",\"renderKey\":1708408191639,\"layout\":\"rowFormItem\",\"rowType\":\"table\",\"tagIcon\":\"icon-ym icon-ym-generator-table\",\"children\":[{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"商品名称\",\"value\":\"name\"},{\"label\":\"商品编码\",\"value\":\"code\"},{\"label\":\"商品规格\",\"value\":\"spec\"}],\"templateJson\":[],\"relationField\":\"name\",\"__config__\":{\"formId\":120,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"商品名称\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408212484,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"productId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529622659227471749\",\"interfaceName\":\"入库单-查询商品\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"单位名称\",\"value\":\"unit_name\"},{\"label\":\"单位类型\",\"value\":\"unit_type\"}],\"templateJson\":[],\"relationField\":\"unit_name\",\"__config__\":{\"formId\":122,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库单位\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408348114,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"outboundUnit\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"523054191598383685\",\"interfaceName\":\"加工单-查询单位\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"货区名称\",\"value\":\"name\"},{\"label\":\"货区编码\",\"value\":\"code\"}],\"templateJson\":[{\"fieldName\":\"\",\"field\":\"warehouseId\",\"defaultValue\":\"\",\"jnpfKey\":\"popupSelect\",\"dataType\":\"varchar\",\"parameter\":\"warehouseId\",\"id\":\"Y4nIRy1\",\"required\":0,\"relationField\":\"warehouseId\"}],\"relationField\":\"name\",\"__config__\":{\"formId\":126,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库货区id\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408625415,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"outboundAreaId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529624294691458949\",\"interfaceName\":\"入库单-根据仓库查询货区\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":124,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库数量\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408507865,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"isSubTable\":true,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"outboundNumber\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"商品名称\",\"value\":\"name\"},{\"label\":\"批次号\",\"value\":\"batch_number\"}],\"templateJson\":[{\"fieldName\":\"\",\"field\":\"productId\",\"defaultValue\":\"\",\"jnpfKey\":\"popupSelect\",\"dataType\":\"varchar\",\"parameter\":\"productId\",\"id\":\"g0G0Wy1\",\"required\":0,\"relationField\":\"tableField119-productId\"}],\"relationField\":\"name\",\"__config__\":{\"formId\":130,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"批次号\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708480919674,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"batchNumber\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529928174901940421\",\"interfaceName\":\"出库单-根据商品查询批次号\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"relationTable\":\"jg_warehousing_outbound_product\",\"endRelationField\":\"\",\"defaultValue\":\"\",\"parentVModel\":\"tableField119\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408743443,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":true,\"isSubTable\":true,\"tag\":\"JnpfDatePicker\",\"formId\":127,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"dateManufacture\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"date\"}],\"showTitle\":true,\"complexHeaderList\":[],\"tag\":\"JnpfInputTable\",\"componentName\":\"row119\",\"span\":24},\"showAddBtn\":true,\"__vModel__\":\"tableField119\",\"disabled\":false}],\"span\":24}"); return sb.toString(); + sb.append("{\"popupType\":\"general\",\"idGlobal\":130,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"1000px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1708406275043,\"tableName\":\"jg_warehousing_storage\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"基础信息\",\"helpMessage\":\"\"},{\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"billRule\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"rule\":\"chukudanbianhao\",\"className\":[],\"label\":\"单据编号\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708406291790,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-documents\",\"ruleName\":\"出库单编号\",\"tag\":\"JnpfInput\",\"span\":8},\"readonly\":true,\"__vModel__\":\"documentNo\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"系统自动生成\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单据类型\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708406384094,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"销售出库\",\"id\":\"1\"},{\"fullName\":\"挑拨出库\",\"id\":\"2\"},{\"fullName\":\"退供出库\",\"id\":\"3\"},{\"fullName\":\"领用出库\",\"id\":\"4\"},{\"fullName\":\"盘亏出库\",\"id\":\"5\"},{\"fullName\":\"报损出库\",\"id\":\"6\"},{\"fullName\":\"其他出库\",\"id\":\"7\"},{\"fullName\":\"差异调整出库\",\"id\":\"8\"},{\"fullName\":\"库存初始化\",\"id\":\"9\"},{\"fullName\":\"货权转移出库\",\"id\":\"10\"},{\"fullName\":\"采购发货单出库\",\"id\":\"11\"},{\"fullName\":\"销售发货单出库\",\"id\":\"12\"}],\"multiple\":false,\"__vModel__\":\"warehousingOutboundType\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"通知编号\",\"value\":\"warehousing_code\"},{\"label\":\"供应商\",\"value\":\"subject_basic_id\"},{\"label\":\"仓库\",\"value\":\"warehouse_id\"}],\"templateJson\":[],\"relationField\":\"warehousing_code\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"关联单号\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708406648706,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"warehousingId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529924192531927237\",\"interfaceName\":\"出库单-查询出库通知\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"仓库编号\",\"value\":\"code\"},{\"label\":\"仓库名称\",\"value\":\"name\"},{\"label\":\"仓库简称\",\"value\":\"simple_name\"}],\"templateJson\":[],\"relationField\":\"name\",\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库仓库\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708406959225,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"warehouseId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529617754022498181\",\"interfaceName\":\"入库单-查询仓库\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407215891,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":true,\"tag\":\"JnpfDatePicker\",\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"出库时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"warehousingTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"date\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":128,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库原因\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708480003723,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"outboundReason\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"备注\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407247496,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"remark\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"createTime\",\"defaultValue\":\"\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"创建时间\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407256307,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-createtime\",\"tag\":\"JnpfOpenData\",\"span\":24},\"readonly\":true,\"__vModel__\":\"creatorTime\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"\",\"type\":\"currTime\"},{\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"createUser\",\"defaultValue\":\"\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"创建用户\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407257191,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-founder\",\"tag\":\"JnpfOpenData\",\"span\":24},\"readonly\":true,\"__vModel__\":\"creatorUserId\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"\",\"type\":\"currUser\"},{\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"modifyTime\",\"defaultValue\":\"\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"修改时间\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407258223,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-modifytime\",\"tag\":\"JnpfInput\",\"span\":24},\"readonly\":true,\"__vModel__\":\"lastModifyTime\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"系统自动生成\"},{\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"modifyUser\",\"defaultValue\":\"\",\"noShow\":true,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"修改用户\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407258873,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-modifier\",\"tag\":\"JnpfInput\",\"span\":24},\"readonly\":true,\"__vModel__\":\"lastModifyUserId\",\"style\":{\"width\":\"100%\"},\"placeholder\":\"系统自动生成\"},{\"__config__\":{\"formId\":115,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1708407334823,\"tableName\":\"jg_warehousing_storage\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"附件\",\"helpMessage\":\"\"},{\"showSummary\":false,\"actionText\":\"添加\",\"tableConf\":{},\"defaultValue\":[],\"addTableConf\":{\"popupType\":\"dialog\",\"hasPage\":true,\"popupTitle\":\"选择数据\",\"pageSize\":20,\"columnOptions\":[],\"interfaceId\":\"\",\"interfaceName\":\"\",\"relationOptions\":[],\"templateJson\":[],\"popupWidth\":\"800px\"},\"thousands\":false,\"summaryField\":[],\"thousandsField\":[],\"showDeleteBtn\":true,\"addType\":0,\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"table\",\"defaultValue\":[],\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库凭证\",\"type\":\"table\",\"showLabel\":false,\"tableName\":\"jg_warehousing_outbound_poundlist\",\"renderKey\":1708407302476,\"layout\":\"rowFormItem\",\"rowType\":\"table\",\"tagIcon\":\"icon-ym icon-ym-generator-table\",\"children\":[{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"凭证编号\",\"value\":\"voucher_code\"},{\"label\":\"凭证类型\",\"value\":\"voucher_type\"},{\"label\":\"车牌号\",\"value\":\"vehicle_number\"},{\"label\":\"商品名称\",\"value\":\"product_name\"}],\"templateJson\":[],\"relationField\":\"voucher_code\",\"__config__\":{\"formId\":116,\"relationTable\":\"jg_warehousing_outbound_poundlist\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField114\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"关联凭证\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708407359407,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"voucherId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529929122277773509\",\"interfaceName\":\"出库单-查询出库凭证\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"}],\"showTitle\":true,\"complexHeaderList\":[],\"tag\":\"JnpfInputTable\",\"componentName\":\"row114\",\"span\":24},\"showAddBtn\":true,\"__vModel__\":\"tableField114\",\"disabled\":false},{\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"groupTitle\",\"dragDisabled\":false,\"className\":[],\"label\":\"分组标题\",\"showLabel\":false,\"required\":false,\"renderKey\":1708408106860,\"tableName\":\"jg_warehousing_storage\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-group\",\"tag\":\"JnpfGroupTitle\",\"span\":24},\"contentPosition\":\"left\",\"content\":\"商品信息\",\"helpMessage\":\"\"},{\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"text\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"文本\",\"showLabel\":false,\"required\":false,\"renderKey\":1708408126480,\"tableName\":\"jg_warehousing_storage\",\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-textarea\",\"tag\":\"JnpfText\",\"span\":24},\"textStyle\":{\"color\":\"#000000\",\"font-weight\":\"normal\",\"text-decoration\":\"none\",\"font-size\":12,\"line-height\":32,\"font-style\":\"normal\",\"text-align\":\"left\"},\"content\":\"默认展示关联单据的商品信息，可直接修改商品数量。\"},{\"showSummary\":false,\"actionText\":\"添加\",\"tableConf\":{},\"defaultValue\":[],\"addTableConf\":{\"popupType\":\"dialog\",\"hasPage\":true,\"popupTitle\":\"选择数据\",\"pageSize\":20,\"columnOptions\":[],\"interfaceId\":\"\",\"interfaceName\":\"\",\"relationOptions\":[],\"templateJson\":[],\"popupWidth\":\"800px\"},\"thousands\":false,\"summaryField\":[],\"thousandsField\":[],\"showDeleteBtn\":true,\"addType\":0,\"__config__\":{\"formId\":119,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"table\",\"defaultValue\":[],\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"\",\"type\":\"table\",\"showLabel\":false,\"tableName\":\"jg_warehousing_outbound_product\",\"renderKey\":1708408191639,\"layout\":\"rowFormItem\",\"rowType\":\"table\",\"tagIcon\":\"icon-ym icon-ym-generator-table\",\"children\":[{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"商品名称\",\"value\":\"name\"},{\"label\":\"商品编码\",\"value\":\"code\"},{\"label\":\"商品规格\",\"value\":\"spec\"}],\"templateJson\":[],\"relationField\":\"name\",\"__config__\":{\"formId\":120,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"商品名称\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408212484,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"productId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529622659227471749\",\"interfaceName\":\"入库单-查询商品\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"单位名称\",\"value\":\"unit_name\"},{\"label\":\"单位类型\",\"value\":\"unit_type\"}],\"templateJson\":[],\"relationField\":\"unit_name\",\"__config__\":{\"formId\":122,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库单位\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408348114,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"outboundUnit\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"523054191598383685\",\"interfaceName\":\"加工单-查询单位\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"货区名称\",\"value\":\"name\"},{\"label\":\"货区编码\",\"value\":\"code\"}],\"templateJson\":[{\"fieldName\":\"\",\"field\":\"warehouseId\",\"defaultValue\":\"\",\"jnpfKey\":\"popupSelect\",\"dataType\":\"varchar\",\"parameter\":\"warehouseId\",\"id\":\"Y4nIRy1\",\"required\":0,\"relationField\":\"warehouseId\"}],\"relationField\":\"name\",\"__config__\":{\"formId\":126,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库货区id\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408625415,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"outboundAreaId\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529624294691458949\",\"interfaceName\":\"入库单-根据仓库查询货区\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":124,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"出库数量\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408507865,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"isSubTable\":true,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"outboundNumber\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"商品名称\",\"value\":\"name\"},{\"label\":\"批次号\",\"value\":\"batch_number\"}],\"templateJson\":[{\"fieldName\":\"\",\"field\":\"productId\",\"defaultValue\":\"\",\"jnpfKey\":\"popupSelect\",\"dataType\":\"varchar\",\"parameter\":\"productId\",\"id\":\"g0G0Wy1\",\"required\":0,\"relationField\":\"tableField119-productId\"}],\"relationField\":\"name\",\"__config__\":{\"formId\":130,\"relationTable\":\"jg_warehousing_outbound_product\",\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"parentVModel\":\"tableField119\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"批次号\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708480919674,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"isSubTable\":true,\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":24},\"popupTitle\":\"选择数据\",\"__vModel__\":\"batchNumber\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"interfaceId\":\"529928174901940421\",\"interfaceName\":\"出库单-根据商品查询批次号\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"relationTable\":\"jg_warehousing_outbound_product\",\"endRelationField\":\"\",\"defaultValue\":\"\",\"parentVModel\":\"tableField119\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"jg_warehousing_outbound\",\"renderKey\":1708408743443,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":true,\"isSubTable\":true,\"tag\":\"JnpfDatePicker\",\"formId\":127,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":24},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"dateManufacture\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择\",\"type\":\"date\"}],\"showTitle\":true,\"complexHeaderList\":[],\"tag\":\"JnpfInputTable\",\"componentName\":\"row119\",\"span\":24},\"showAddBtn\":true,\"__vModel__\":\"tableField119\",\"disabled\":false}],\"span\":24}"); return sb.toString(); } /** 列表字段配置json */ public static final String getColumnData(){ @@ -36,6 +36,6 @@ public class WarehousingOutboundConstant{ /** 表列表 */ public static final String getTableList(){ StringBuilder sb = new StringBuilder(); - sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"jg_warehousing_outbound\",\"tableName\":\"入库单\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"document_no\",\"field\":\"documentNo\",\"fieldName\":\"单据编号\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehousing_outbound_type\",\"field\":\"warehousingOutboundType\",\"fieldName\":\"业务类型(1：全部 2：盘盈出库 3：销售出库 4：调拨出库 5：退供出库 6：其他出库 7：差异调整入库 8：领用出库 9：货权转移出库 10：报损出库 11：库存初始化\",\"dataType\":\"char\",\"dataLength\":\"5\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehousing_outbound_status\",\"field\":\"warehousingOutboundStatus\",\"fieldName\":\"单据状态(1:待提交 2：待审核 3：已驳回 4：已入库 5：已取消)\",\"dataType\":\"char\",\"dataLength\":\"1\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehousing_id\",\"field\":\"warehousingId\",\"fieldName\":\"业务id(出库通知id）\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehouse_id\",\"field\":\"warehouseId\",\"fieldName\":\"仓库id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehousing_time\",\"field\":\"warehousingTime\",\"fieldName\":\"出库时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_reason\",\"field\":\"outboundReason\",\"fieldName\":\"出库原因\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remark\",\"field\":\"remark\",\"fieldName\":\"备注\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_version\",\"field\":\"version\",\"fieldName\":\"乐观锁\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]},{\"relationField\":\"id\",\"relationTable\":\"jg_warehousing_outbound\",\"table\":\"jg_warehousing_outbound_poundlist\",\"tableName\":\"入库单和凭证关联关系单\",\"tableField\":\"warehousingOutboundId\",\"typeId\":\"0\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"warehousing_outbound_id\",\"field\":\"warehousingOutboundId\",\"fieldName\":\"业务id(出库单id）\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"voucher_id\",\"field\":\"voucherId\",\"fieldName\":\"关联凭证id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remark\",\"field\":\"remark\",\"fieldName\":\"备注\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]},{\"relationField\":\"id\",\"relationTable\":\"jg_warehousing_outbound\",\"table\":\"jg_warehousing_outbound_product\",\"tableName\":\"入库单商品信息\",\"tableField\":\"warehousingOutboundId\",\"typeId\":\"0\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"warehousing_outbound_id\",\"field\":\"warehousingOutboundId\",\"fieldName\":\"出库单id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"product_id\",\"field\":\"productId\",\"fieldName\":\"商品id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_area_id\",\"field\":\"outboundAreaId\",\"fieldName\":\"出库货区id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_unit\",\"field\":\"outboundUnit\",\"fieldName\":\"出库单位（1：吨）\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_unit_spec\",\"field\":\"outboundUnitSpec\",\"fieldName\":\"出库单位规格\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"expected_receipt_quantity\",\"field\":\"expectedReceiptQuantity\",\"fieldName\":\"预计出库数量\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"received_quantity\",\"field\":\"receivedQuantity\",\"fieldName\":\"已出库数量\",\"dataType\":\"decimal\",\"dataLength\":\"21,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remaining_stockable_quantity\",\"field\":\"remainingStockableQuantity\",\"fieldName\":\"剩余可出库数量\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_number\",\"field\":\"outboundNumber\",\"fieldName\":\"出库数量\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"batch_number\",\"field\":\"batchNumber\",\"fieldName\":\"批次号\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"date_manufacture\",\"field\":\"dateManufacture\",\"fieldName\":\"生产日期\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); + sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"jg_warehousing_outbound\",\"tableName\":\"入库单\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"document_no\",\"field\":\"documentNo\",\"fieldName\":\"单据编号\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehousing_outbound_type\",\"field\":\"warehousingOutboundType\",\"fieldName\":\"业务类型(1：销售出库 2：调拨出库 3：退供出库 4：领用出库 5：盘亏出库 6：报损出库 7：其他出库 8：差异调整出库 9：库存初始化 10：货权转移出库 11：采购发货单出库 12：销售发货单出库\",\"dataType\":\"char\",\"dataLength\":\"5\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehousing_outbound_status\",\"field\":\"warehousingOutboundStatus\",\"fieldName\":\"单据状态(1:待提交 2：待审核 3：已出库 4：已驳回 5：已关闭)\",\"dataType\":\"char\",\"dataLength\":\"1\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehousing_id\",\"field\":\"warehousingId\",\"fieldName\":\"业务id(出库通知id）\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehouse_id\",\"field\":\"warehouseId\",\"fieldName\":\"仓库id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"warehousing_time\",\"field\":\"warehousingTime\",\"fieldName\":\"出库时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_reason\",\"field\":\"outboundReason\",\"fieldName\":\"出库原因\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remark\",\"field\":\"remark\",\"fieldName\":\"备注\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_version\",\"field\":\"version\",\"fieldName\":\"乐观锁\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]},{\"relationField\":\"id\",\"relationTable\":\"jg_warehousing_outbound\",\"table\":\"jg_warehousing_outbound_poundlist\",\"tableName\":\"入库单和凭证关联关系单\",\"tableField\":\"warehousingOutboundId\",\"typeId\":\"0\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"warehousing_outbound_id\",\"field\":\"warehousingOutboundId\",\"fieldName\":\"业务id(出库单id）\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remark\",\"field\":\"remark\",\"fieldName\":\"备注\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"product_id\",\"field\":\"productId\",\"fieldName\":\"商品id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"unit\",\"field\":\"unit\",\"fieldName\":\"单位\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"gross_weight\",\"field\":\"grossWeight\",\"fieldName\":\"毛重\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"tare_weight\",\"field\":\"tareWeight\",\"fieldName\":\"皮重\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"buckle_weight\",\"field\":\"buckleWeight\",\"fieldName\":\"扣重\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"net_weight\",\"field\":\"netWeight\",\"fieldName\":\"净重\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"voucher_id\",\"field\":\"voucherId\",\"fieldName\":\"关联凭证id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"storage_product_id\",\"field\":\"storageProductId\",\"fieldName\":\"入库单下的对应商品表id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"document_type\",\"field\":\"documentType\",\"fieldName\":\"单据类型（1：收货凭证 2：发货凭证）\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"voucher_type\",\"field\":\"voucherType\",\"fieldName\":\"凭证类型（1：磅单 2：收据 3：其他）\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"voucher_code\",\"field\":\"voucherCode\",\"fieldName\":\"凭证编号\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"poundlist_time\",\"field\":\"poundlistTime\",\"fieldName\":\"磅单时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"vehicle_id\",\"field\":\"vehicleId\",\"fieldName\":\"车辆id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"vehicle_name\",\"field\":\"vehicleName\",\"fieldName\":\"车牌号\",\"dataType\":\"varchar\",\"dataLength\":\"20\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"product_name\",\"field\":\"productName\",\"fieldName\":\"商品名称\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"spec\",\"field\":\"spec\",\"fieldName\":\"规格\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"pound_code\",\"field\":\"poundCode\",\"fieldName\":\"磅单编号\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"document_types\",\"field\":\"documentTypes\",\"fieldName\":\"单据类型汉字\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"voucher_types\",\"field\":\"voucherTypes\",\"fieldName\":\"凭证类型汉字\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"business_type\",\"field\":\"businessType\",\"fieldName\":\"业务类型(1:采购2：销售)\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]},{\"relationField\":\"id\",\"relationTable\":\"jg_warehousing_outbound\",\"table\":\"jg_warehousing_outbound_product\",\"tableName\":\"入库单商品信息\",\"tableField\":\"warehousingOutboundId\",\"typeId\":\"0\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"自然主键\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"warehousing_outbound_id\",\"field\":\"warehousingOutboundId\",\"fieldName\":\"出库单id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"product_id\",\"field\":\"productId\",\"fieldName\":\"商品id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_area_id\",\"field\":\"outboundAreaId\",\"fieldName\":\"出库货区id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_unit\",\"field\":\"outboundUnit\",\"fieldName\":\"出库单位（1：吨）\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_unit_spec\",\"field\":\"outboundUnitSpec\",\"fieldName\":\"出库单位规格\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"expected_receipt_quantity\",\"field\":\"expectedReceiptQuantity\",\"fieldName\":\"预计出库数量\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"received_quantity\",\"field\":\"receivedQuantity\",\"fieldName\":\"已出库数量\",\"dataType\":\"decimal\",\"dataLength\":\"21,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"remaining_stockable_quantity\",\"field\":\"remainingStockableQuantity\",\"fieldName\":\"剩余可出库数量\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"outbound_number\",\"field\":\"outboundNumber\",\"fieldName\":\"出库数量\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"batch_number\",\"field\":\"batchNumber\",\"fieldName\":\"批次号\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"date_manufacture\",\"field\":\"dateManufacture\",\"fieldName\":\"生产日期\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"spec\",\"field\":\"spec\",\"fieldName\":\"规格\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"inventory_unit_id\",\"field\":\"inventoryUnitId\",\"fieldName\":\"库存单位\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); } } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucher.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucher.vue index 4ffa2eb8..0ff3e460 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucher.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucher.vue @@ -36,10 +36,10 @@ - + @@ -83,7 +83,7 @@ export default { if (excludeIdList && excludeIdList instanceof Array) { this.excludeIdList = excludeIdList; } - if (val && typeof(val) == 'string') { + if (val && typeof (val) == 'string') { this.val = val; } let query = { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue index 4ffa2eb8..0ff3e460 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue @@ -36,10 +36,10 @@ - + @@ -83,7 +83,7 @@ export default { if (excludeIdList && excludeIdList instanceof Array) { this.excludeIdList = excludeIdList; } - if (val && typeof(val) == 'string') { + if (val && typeof (val) == 'string') { this.val = val; } let query = { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue index e84cde67..9f3089c8 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue @@ -30,8 +30,11 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -66,7 +135,7 @@ - + *出库单位 + @@ -399,21 +459,16 @@ *批次号 + + - + + + + @@ -236,8 +240,7 @@ export default { flowListVisible: false, flowList: [], exportBoxVisible: false, - warehousingOutboundTypeOptions: [{ "fullName": "销售出库", "id": "1" }, { "fullName": "挑拨出库", "id": "2" }, { "fullName": "退供出库", "id": "3" }, { "fullName": "领用出库", "id": "4" }, { "fullName": "盘亏出库", "id": "5" }, { "fullName": "报损出库", "id": "6" }, { "fullName": "其他出库", "id": "7" }, { "fullName": "差异调整出库", "id": "8" }, { "fullName": "库存初始化", "id": "9" }, { "fullName": "货权转移出库", "id": "10" }], - warehousingOutboundTypeProps: { "label": "fullName", "value": "id" }, + warehousingOutboundTypeOptions: [{ "fullName": "销售出库", "id": "1" }, { "fullName": "挑拨出库", "id": "2" }, { "fullName": "退供出库", "id": "3" }, { "fullName": "领用出库", "id": "4" }, { "fullName": "盘亏出库", "id": "5" }, { "fullName": "报损出库", "id": "6" }, { "fullName": "其他出库", "id": "7" }, { "fullName": "差异调整出库", "id": "8" }, { "fullName": "库存初始化", "id": "9" }, { "fullName": "货权转移出库", "id": "10" }, { "fullName": "采购发货单出库", "id": "11" }, { "fullName": "销售发货单出库", "id": "12" }], warehousingOutboundTypeProps: { "label": "fullName", "value": "id" }, tableField114_voucherIdcolumnOptions: [{ "label": "凭证编号", "value": "voucher_code" }, { "label": "凭证类型", "value": "voucher_type" }, { "label": "车牌号", "value": "vehicle_number" }, { "label": "商品名称", "value": "product_name" },], tableField119_productIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "商品规格", "value": "spec" },], tableField119_outboundUnitcolumnOptions: [{ "label": "单位名称", "value": "unit_name" }, { "label": "单位类型", "value": "unit_type" },], diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue index b1a6e0aa..ea1450c5 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue @@ -31,7 +31,9 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -411,7 +483,7 @@ - @@ -428,6 +500,21 @@ clearable :style='{ "width": "100%" }'> + --> + + + + - - + -->