DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复采购和集成酸轧细节

Browse Source
This commit is contained in:
wangyu
2026-06-29 10:18:26 +08:00
parent 59dad19296
commit 8c7cce90ba
18 changed files with 326 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
klp-erp/src/main/java/com/klp/erp/controller/ErpPurchasePlanController.java
View File

@@ -13,7 +13,6 @@ import com.klp.common.utils.poi.ExcelUtil;
import com.klp.erp.domain.bo.ErpPurchasePlanAuditBo;
import com.klp.erp.domain.bo.ErpPurchasePlanBo;
import com.klp.erp.domain.vo.ErpContractOptionVo;
import com.klp.erp.domain.vo.ErpPurchasePlanDeliveryBatchVo;
import com.klp.erp.domain.vo.ErpPurchasePlanDeliveryVo;
import com.klp.erp.domain.vo.ErpPurchasePlanItemVo;
import com.klp.erp.domain.vo.ErpPurchasePlanVo;
@@ -149,19 +148,13 @@ public class ErpPurchasePlanController extends BaseController {
return R.ok();
}
/** 某计划的到货上传批次（每次上传一条，可回看） */
@GetMapping("/{planId}/deliveryBatches")
public R<List<ErpPurchasePlanDeliveryBatchVo>> deliveryBatches(@PathVariable Long planId) {
return R.ok(iErpPurchasePlanService.queryDeliveryBatches(planId));
/** 厂商历史记忆（手填自动补全） */
@GetMapping("/manufacturers")
public R<List<String>> manufacturers(@RequestParam(value = "keyword", required = false) String keyword) {
return R.ok(iErpPurchasePlanService.queryManufacturers(keyword));
}
/** 某批次的到货明细 */
@GetMapping("/deliveryBatch/{batchId}")
public R<List<ErpPurchasePlanDeliveryVo>> deliveryByBatch(@PathVariable Long batchId) {
return R.ok(iErpPurchasePlanService.queryDeliveryListByBatch(batchId));
}
/** 到货记录页左侧：审核通过的计划分页 */
/** 到货记录页左侧：审核通过的合同分页 */
@GetMapping("/deliveryPlans")
public TableDataInfo<ErpPurchasePlanVo> deliveryPlans(@RequestParam(value = "keyword", required = false) String keyword,
PageQuery pageQuery) {