yzc il y a 1 an
Parent
commit
444eb9c2c3

+ 5 - 0
hx-form/src/main/java/com/fjhx/form/entity/cost/po/CostControlDetail.java

@@ -68,6 +68,9 @@ public class CostControlDetail extends BasePo {
     @Label("本期应付(抵扣后)")
     private String currentPayableDeduction;
 
+    @Label("本期应付(抵扣前)")
+    private String currentPayableDeductionBefore;
+
     /**
      * 记账科目
      */
@@ -221,4 +224,6 @@ public class CostControlDetail extends BasePo {
      */
     @Label("费用合计")
     private String costMoneySum;
+
+
 }

+ 1 - 1
hx-mes/src/main/java/com/fjhx/mes/service/WmsServiceImpl.java

@@ -25,7 +25,7 @@ public class WmsServiceImpl implements WmsService {
 
     @Override
     public void updateProdStatus(List<Long> cpIds, Long prodOrderId) {
-        List<ContractProductVo> list = contractProductService.getList(IWrapper.<ContractProduct>getWrapper().in(ContractProduct::getId, cpIds));
+        List<ContractProductVo> list = contractProductService.getList(IWrapper.<ContractProduct>getWrapper().in("cp", ContractProduct::getId, cpIds));
         for (ContractProductVo contractProductVo : list) {
             BigDecimal outboundQuantity = contractProductVo.getOutboundQuantity();
             BigDecimal quantity = contractProductVo.getQuantity();