Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
3b7d7bb3 由 康伟
选项

kangwei: 扩展：统购合同选中水务公司，分销合同使用水厂，根据货号查询水厂以及水厂所属水务公司的物料信息

1 个父辈 da332013
内嵌 并排
正在显示 3 个修改的文件 包含 34 行增加 和 15 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpSettlementController.java
...@@ -85,6 +85,11 @@ public class ErpSettlementController { ...@@ -85,6 +85,11 @@ public class ErpSettlementController {
85 public Result<ErpSettlementVO> supplierSettlement(@RequestParam(name="ids",required=true) String ids) { 85 public Result<ErpSettlementVO> supplierSettlement(@RequestParam(name="ids",required=true) String ids) {
86 Result<ErpSettlementVO> result = new Result<>(); 86 Result<ErpSettlementVO> result = new Result<>();
87 ErpSettlementVO erpSettlementVO = null; 87 ErpSettlementVO erpSettlementVO = null;
88 if(StringUtils.isEmpty(ids)){
89 result.error500("请选择记录进行结算");
90 return result;
91 }
92
88 List<ErpSettlementVO> settlementVOList = erpSettlementService.supplierSettlement(JSUtils.quoteEach(ids,",")); 93 List<ErpSettlementVO> settlementVOList = erpSettlementService.supplierSettlement(JSUtils.quoteEach(ids,","));
89 if(settlementVOList==null || settlementVOList.isEmpty()) { 94 if(settlementVOList==null || settlementVOList.isEmpty()) {
90 result.error500("根据供应商与合同号未找到实体"); 95 result.error500("根据供应商与合同号未找到实体");
...@@ -106,12 +111,15 @@ public class ErpSettlementController { ...@@ -106,12 +111,15 @@ public class ErpSettlementController {
106 result.error500("查询多个供应商："+supplierName+";合同号："+contractCode+"记录;请选择某一个供应商，同一合同"); 111 result.error500("查询多个供应商："+supplierName+";合同号："+contractCode+"记录;请选择某一个供应商，同一合同");
107 }else{ 112 }else{
108 List<ErpSettlementItemVO> erpSettlementItemList = erpSettlementService.querySupplierSettlementByMaterialIds(JSUtils.quoteEach(ids,",")); 113 List<ErpSettlementItemVO> erpSettlementItemList = erpSettlementService.querySupplierSettlementByMaterialIds(JSUtils.quoteEach(ids,","));
109 erpSettlementVO.setItemList( erpSettlementItemList ); 114 if(erpSettlementItemList != null && !erpSettlementItemList.isEmpty()){
110 115 erpSettlementVO.setItemList( erpSettlementItemList );
111 erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(erpSettlementItemList) ); 116 erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(erpSettlementItemList) );
112 117 result.setResult(erpSettlementVO);
113 result.setResult(erpSettlementVO); 118 result.setSuccess(true);
114 result.setSuccess(true); 119 }else{
120 result.error500("未找到审核通过的记录！");
121 return result;
122 }
115 } 123 }
116 return result; 124 return result;
117 } 125 }
...@@ -122,6 +130,11 @@ public class ErpSettlementController { ...@@ -122,6 +130,11 @@ public class ErpSettlementController {
122 public Result<ErpSettlementVO> waterDepartSettlement(@RequestParam(name="ids",required=true) String ids) { 130 public Result<ErpSettlementVO> waterDepartSettlement(@RequestParam(name="ids",required=true) String ids) {
123 Result<ErpSettlementVO> result = new Result<ErpSettlementVO>(); 131 Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
124 ErpSettlementVO erpSettlementVO = null; 132 ErpSettlementVO erpSettlementVO = null;
133 if(StringUtils.isEmpty(ids)){
134 result.error500("请选择记录进行结算");
135 return result;
136 }
137
125 List<ErpSettlementVO> settlementVOList = erpSettlementService.waterDepartSettlement(JSUtils.quoteEach(ids,",")); 138 List<ErpSettlementVO> settlementVOList = erpSettlementService.waterDepartSettlement(JSUtils.quoteEach(ids,","));
126 if(settlementVOList==null || settlementVOList.isEmpty()) { 139 if(settlementVOList==null || settlementVOList.isEmpty()) {
127 result.error500("根据部门与合同号未找到实体"); 140 result.error500("根据部门与合同号未找到实体");
...@@ -144,12 +157,16 @@ public class ErpSettlementController { ...@@ -144,12 +157,16 @@ public class ErpSettlementController {
144 result.error500("查询出多个水厂："+departName+"；合同编号:"+contractCode+"记录;请选择某一个水厂，同一合同"); 157 result.error500("查询出多个水厂："+departName+"；合同编号:"+contractCode+"记录;请选择某一个水厂，同一合同");
145 }else{ 158 }else{
146 List<ErpSettlementItemVO> settlementItemList = erpSettlementService.queryWaterDepartSettlementByMaterialIds(JSUtils.quoteEach(ids,",")); 159 List<ErpSettlementItemVO> settlementItemList = erpSettlementService.queryWaterDepartSettlementByMaterialIds(JSUtils.quoteEach(ids,","));
147 erpSettlementVO.setItemList(settlementItemList ); 160 if(settlementItemList != null && !settlementItemList.isEmpty()){
148 161 erpSettlementVO.setItemList(settlementItemList );
149 //送货单以及物资验收单 162 //送货单以及物资验收单
150 erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(settlementItemList) ); 163 erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(settlementItemList) );
151 result.setResult(erpSettlementVO); 164 result.setResult(erpSettlementVO);
152 result.setSuccess(true); 165 result.setSuccess(true);
166 }else{
167 result.error500("未找到审核通过的记录！");
168 return result;
169 }
153 } 170 }
154 return result; 171 return result;
155 } 172 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/ERPPurchaseContract.java
...@@ -139,7 +139,7 @@ public class ERPPurchaseContract { ...@@ -139,7 +139,7 @@ public class ERPPurchaseContract {
139 @ApiModelProperty(value = "删除标识，0:有效,1:删除") 139 @ApiModelProperty(value = "删除标识，0:有效,1:删除")
140 private java.lang.Integer delFlag; 140 private java.lang.Integer delFlag;
141 141
142 @ApiModelProperty(value = "删除标识，0:有效,1:删除") 142 @ApiModelProperty(value = "入库单编号")
143 private String equipmentInId; 143 private String equipmentInId;
144 144
145 /**审批意见*/ 145 /**审批意见*/
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
...@@ -108,6 +108,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -108,6 +108,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
108 //入库 108 //入库
109 errMsg = syncEquipmentIn(materialINTemp,inWarehouseId); 109 errMsg = syncEquipmentIn(materialINTemp,inWarehouseId);
110 } 110 }
111 materialINTemp.setApproveMessage(materialINVO.getApproveMessage());//审批意见
111 this.baseMapper.updateById( materialINTemp ) ; 112 this.baseMapper.updateById( materialINTemp ) ;
112 //审批记录 113 //审批记录
113 ApproveRecord record = new ApproveRecord( "YJIN", materialINVO.getApplyUser(), materialINVO.getId(), BaseContextHandler.getUserId(), materialINVO.getApproveMessage(), materialINVO.getApproveState()); 114 ApproveRecord record = new ApproveRecord( "YJIN", materialINVO.getApplyUser(), materialINVO.getId(), BaseContextHandler.getUserId(), materialINVO.getApproveMessage(), materialINVO.getApproveState());
...@@ -195,8 +196,9 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -195,8 +196,9 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
195 196
196 ERPPurchaseContract erpPurchaseContract = purchaseContractService.getById(materialINTemp.getPurchaseContractId()); 197 ERPPurchaseContract erpPurchaseContract = purchaseContractService.getById(materialINTemp.getPurchaseContractId());
197 if(erpPurchaseContract != null ){ 198 if(erpPurchaseContract != null ){
198 if(StringUtils.isNotEmpty(erpPurchaseContract.getEquipmentInId())){ 199 EquipmentIn equipmentIn = equipmentInService.getById( erpPurchaseContract.getEquipmentInId() );
199 EquipmentIn equipmentIn = equipmentInService.getById( erpPurchaseContract.getEquipmentInId() ); 200
201 if(equipmentIn != null){
200 equipmentOutDTO.setDepartId( equipmentIn.getDepartId() ) ; 202 equipmentOutDTO.setDepartId( equipmentIn.getDepartId() ) ;
201 equipmentOutDTO.setOutType("9");// 203 equipmentOutDTO.setOutType("9");//
202 equipmentOutDTO.setRemark( materialINTemp.getRemark() ); 204 equipmentOutDTO.setRemark( materialINTemp.getRemark() );
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!