yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

计划入库修改

Browse Source
jg-waiwang-pro
XI_TENG\xixi_ 6 months ago
parent e89a5a924f
commit c418743df5
2 changed files with 76 additions and 4 deletions
Show Stats Download Patch File Download Diff File

68
.gitignore vendored
Unescape View File

@ -0,0 +1,68 @@
jnpf-java-boot/jnpf-admin/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-app/jnpf-app-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-app/jnpf-app-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-app/jnpf-app-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-exception/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-extend/jnpf-extend-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-extend/jnpf-extend-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-extend/jnpf-extend-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-file/jnpf-file-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-file/jnpf-file-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-file/jnpf-file-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-form/jnpf-form-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-form/jnpf-form-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-form/jnpf-form-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-message/jnpf-message-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-message/jnpf-message-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-message/jnpf-message-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-oauth/jnpf-oauth-api/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-oauth/jnpf-oauth-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-oauth/jnpf-oauth-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-oauth/jnpf-oauth-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-permission/jnpf-permission-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-permission/jnpf-permission-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-public/jnpf-common-all/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-public/jnpf-generater-base/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-public/jnpf-provider/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessContact3Mapper.java
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessContact3Service.java
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessContact3ServiceImpl.java
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContact3Entity.java
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline3/BusinessContact3ExcelVO.java
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline3/BusinessContact3Model.java
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-system/jnpf-system-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-system/jnpf-system-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-system/jnpf-system-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdata/jnpf-visualdata-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdata/jnpf-visualdata-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdata/jnpf-visualdata-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-base/jnpf-visualdev-base-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-base/jnpf-visualdev-base-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-base/jnpf-visualdev-base-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-generater/jnpf-visualdev-generater-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-generater/jnpf-visualdev-generater-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-generater/jnpf-visualdev-generater-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-integrate/jnpf-visualdev-integrate-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-integrate/jnpf-visualdev-integrate-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-integrate/jnpf-visualdev-integrate-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-onlinedev/jnpf-visualdev-onlinedev-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-onlinedev/jnpf-visualdev-onlinedev-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-onlinedev/jnpf-visualdev-onlinedev-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-entity/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-workflow/jnpf-workflow-form/jnpf-workflow-form-biz/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-workflow/jnpf-workflow-form/jnpf-workflow-form-controller/src/main/resources/rebel.xml
jnpf-java-boot/jnpf-workflow/jnpf-workflow-form/jnpf-workflow-form-entity/src/main/resources/rebel.xml

12
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
Unescape View File

@ -126,13 +126,17 @@ public class WarehousingNotificationController {
//其他入库 //其他入库
} }
List<WarehousingProductEntity> warehousingProductEntityList=warehousingNotificationService.getWarehousingProductList(entity.getId()); //明天写这个，这里是计划查询，到时候直接sql查询
for (WarehousingProductEntity warehousingProductEntity:warehousingProductEntityList){ // List<WarehousingProductEntity> warehousingProductEntityList=warehousingNotificationService.getWarehousingProductList(entity.getId());
List<WarehousingProductEntity> warehousingProductEntityList1=warehousingNotificationService.queryNotificationProduct(entity.getId());
for (WarehousingProductEntity warehousingProductEntity:warehousingProductEntityList1){
entity.setReceivedQuantity(warehousingProductEntity.getReceivedQuantity()); entity.setReceivedQuantity(warehousingProductEntity.getReceivedQuantity());
entity.setRemainingStockableQuantity(warehousingProductEntity.getRemainingStockableQuantity()); entity.setRemainingStockableQuantity(warehousingProductEntity.getRemainingStockableQuantity());
entity.setNotificationStorageNumber(warehousingProductEntity.getNotificationStorageNumber()); entity.setNotificationStorageNumber(warehousingProductEntity.getNotificationStorageNumber());
} }
List<BusinessOrderEntity> businessOrderEntityList =warehousingNotificationService.queryBusinessOrderType(entity.getId()); List<BusinessOrderEntity> businessOrderEntityList =warehousingNotificationService.queryBusinessOrderType(entity.getId());
for (BusinessOrderEntity businessOrderEntity:businessOrderEntityList){ for (BusinessOrderEntity businessOrderEntity:businessOrderEntityList){
entity.setTransactionMode(businessOrderEntity.getTransactionMode()); entity.setTransactionMode(businessOrderEntity.getTransactionMode());
@ -219,7 +223,7 @@ public class WarehousingNotificationController {
//其他出库 //其他出库
} }
List<WarehousingProductEntity> warehousingProductEntityList=warehousingNotificationService.getWarehousingProductList(entity.getId()); List<WarehousingProductEntity> warehousingProductEntityList=warehousingNotificationService.queryNotificationProduct(entity.getId());
for (WarehousingProductEntity warehousingProductEntity:warehousingProductEntityList){ for (WarehousingProductEntity warehousingProductEntity:warehousingProductEntityList){
entity.setReceivedQuantity(warehousingProductEntity.getReceivedQuantity()); entity.setReceivedQuantity(warehousingProductEntity.getReceivedQuantity());
entity.setRemainingStockableQuantity(warehousingProductEntity.getRemainingStockableQuantity()); entity.setRemainingStockableQuantity(warehousingProductEntity.getRemainingStockableQuantity());

Write Preview
Loading…
Cancel
Save