diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java index 77da644f6..ddcd3b589 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java @@ -2,7 +2,6 @@ package com.op.wms.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +22,7 @@ import com.op.common.core.web.page.TableDataInfo; /** * 白坯原材料采购单Controller - * + * * @author ruoyi * @date 2024-11-04 */ @@ -37,7 +36,7 @@ public class BpProcureOrderController extends BaseController /** * 查询白坯原材料采购单列表 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:list')") + @GetMapping("/list") public TableDataInfo list(BpProcureOrder bpProcureOrder) { @@ -49,7 +48,7 @@ public class BpProcureOrderController extends BaseController /** * 导出白坯原材料采购单列表 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:export')") + @Log(title = "白坯原材料采购单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BpProcureOrder bpProcureOrder) @@ -62,7 +61,7 @@ public class BpProcureOrderController extends BaseController /** * 获取白坯原材料采购单详细信息 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:query')") + @GetMapping(value = "/{ID}") public AjaxResult getInfo(@PathVariable("ID") String ID) { @@ -72,7 +71,7 @@ public class BpProcureOrderController extends BaseController /** * 新增白坯原材料采购单 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:add')") + @Log(title = "白坯原材料采购单", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BpProcureOrder bpProcureOrder) @@ -83,7 +82,7 @@ public class BpProcureOrderController extends BaseController /** * 修改白坯原材料采购单 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:edit')") + @Log(title = "白坯原材料采购单", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody BpProcureOrder bpProcureOrder) @@ -94,7 +93,7 @@ public class BpProcureOrderController extends BaseController /** * 删除白坯原材料采购单 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:remove')") + @Log(title = "白坯原材料采购单", businessType = BusinessType.DELETE) @DeleteMapping("/{IDs}") public AjaxResult remove(@PathVariable String[] IDs) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java index 2a5ce4842..6c5710b43 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java @@ -191,8 +191,19 @@ public class OdsProcureOutOrder extends BaseEntity { */ @Excel(name = "计划数量") private BigDecimal planNumber; + + private BigDecimal sapNumber; + private BigDecimal amount; + public BigDecimal getSapNumber() { + return sapNumber; + } + + public void setSapNumber(BigDecimal sapNumber) { + this.sapNumber = sapNumber; + } + public BigDecimal getAmount() { return amount; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index ec4b0b23b..ecfc8a14f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -149,4 +149,6 @@ public interface OdsProcureOutOrderMapper { void updateWMSOdsProcureReturnOrderByids(@Param("order") OdsProcureOutOrder order, @Param("list") List sapMaterialPostingList); List CKlist(OdsProcureOutOrder odsProcureOutOrder); + + void updateWMSOdsProcureOutOrdersapById(OdsProcureOutOrder order1); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 49eadcd80..fd6e55936 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1250,7 +1250,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); String date = dateFormat.format(currentDate); - for (OdsProcureOrder order1: dtos ) { String materialCode= order1.getMaterialCode();//000000040000004873 @@ -1797,7 +1796,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { //先根据出库单获取 // * 退料的移动类型为 262 // * 领料的移动类型为 261-- and wms_ods_procure_out_order.Order_Status='3' + //我把过账状态-- and wms_ods_procure_out_order.User_Defined10!='2'去掉了 List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByIDs(orderList); + List orderList2 = new ArrayList<>();//非反冲 List> mapList = new ArrayList<>();//非反冲 List sapMaterialPostingFCList = new ArrayList<>();//反冲 @@ -1847,6 +1848,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String userDefined9 = (String) map.get("MATERIALDOCUMENT"); order.setUserDefined9(userDefined9); order.setUserDefined10("2");//成功 + for (OdsProcureOutOrder order1: + orderList2 ) { + BigDecimal sapNumber= order1.getSapNumber(); + order1.setSapNumber(sapNumber.add(order1.getOutNumber()));//成功..这个是否的outNumber是用已出库减去已经过账的数量 + odsProcureOutOrderMapper.updateWMSOdsProcureOutOrdersapById(order1); + } odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2); for (OdsProcureOutOrder order1: orderList2) { @@ -1880,6 +1887,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String userDefined9 = (String) map.get("MATERIALDOCUMENT"); order.setUserDefined9(userDefined9); order.setUserDefined10("2");//成功 + for (OdsProcureOutOrder order1: + orderList2FC ) { + BigDecimal sapNumber= order1.getSapNumber(); + order1.setSapNumber(sapNumber.add(order1.getOutNumber()));//成功..这个是否的outNumber是用已出库减去已经过账的数量 + odsProcureOutOrderMapper.updateWMSOdsProcureOutOrdersapById(order1); + } odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2FC); for (OdsProcureOutOrder order1: orderList2FC) { @@ -2499,7 +2512,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setUserDefined4(order1.getUserDefined4()); //出库明细 odsProcureOutOrderMapper.insertWmsRawMissionOut(order); - + //BigDecimal sapNumber =order1.getSapNumber(); BigDecimal realityNumber1 = order1.getOutNumber();//累出库数 BigDecimal realityNumber = order1.getPlanNumber();//计划 BigDecimal planNumber = amount;//本次实际数量 @@ -2509,7 +2522,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } else { order1.setOrderStatus("2"); } - order1.setOutNumber(tem); + order1.setOutNumber(tem);//这样的话，就可以用已经过账的数量来计算要过账的数量，用出库数量减去已经过账的数量，就是要过账的数量，只要不为0，就可以进行 + +// order1.setSapNumber(sapNumber.add(planNumber));//原本的过账数量 odsProcureOutOrderMapper.updateWmsOdsProcureOutOrder(order1);//订单修改--会超 //明细 // BigDecimal temk= wmsOdsMateStorageNewsSn.getAmount().subtract(amount); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index a7334de5c..b2b837f95 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -43,6 +43,7 @@ + limit #{page.pageOffset} , #{page.rows} @@ -451,7 +452,10 @@ update wms_ods_procure_out_order set User_Defined10 = #{order.userDefined10}, - User_Defined9 = #{order.userDefined9}, + User_Defined9 = CASE + WHEN User_Defined9 IS NULL OR User_Defined9 = '' THEN #{order.userDefined9} + ELSE CONCAT(User_Defined9, ',', #{order.userDefined9}) + END, User_Defined11 = #{order.userDefined11} where ID in @@ -805,7 +809,7 @@ wms_ods_procure_out_order.Plan_Date, wms_ods_procure_out_order.Plan_Number, wms_ods_procure_out_order.Unit, - COALESCE ( wms_ods_procure_out_order.Out_Number, 0 ) AS Out_Number, + COALESCE ( wms_ods_procure_out_order.Out_Number, 0 ) - COALESCE ( wms_ods_procure_out_order.Sap_Number, 0 ) AS Out_Number , wms_raw_mission_out.user_defined2 Loc_Code, wms_ods_procure_out_order.Loc_Desc, wms_ods_procure_out_order.Production_Line_Desc, @@ -830,6 +834,7 @@ wms_ods_procure_out_order.Last_Update_Date, wms_ods_procure_out_order.Active, wms_ods_procure_out_order.Enterprise_Id, + COALESCE ( wms_ods_procure_out_order.Sap_Number, 0 ) AS Sap_Number, wms_ods_procure_out_order.Enterprise_Code FROM wms_ods_procure_out_order @@ -839,7 +844,7 @@ #{odsProcureOutOrder.ID} - and wms_ods_procure_out_order.User_Defined10!='2' + AND (COALESCE ( wms_ods_procure_out_order.Out_Number, 0 ) - COALESCE ( wms_ods_procure_out_order.Sap_Number, 0 ))>0 + + update wms_ods_procure_out_order + set Sap_Number = #{order.sapNumber} + where ID = #{order.ID} +