完善维修退料领料详情

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@@ -93,7 +93,15 @@ public class AsBusrepairBill extends BaseEntity {
     private String groupName;
     @ApiModelProperty("应收金额")
     private BigDecimal receivableAmount;
-
-
+    @ApiModelProperty("工时费")
+    private BigDecimal hourAmount;
+    @ApiModelProperty("材料费")
+    private BigDecimal goodsAmount;
+    @ApiModelProperty("外出费")
+    private BigDecimal outAmount;
+    @ApiModelProperty("厂家补助")
+    private BigDecimal subsidyAmount;
+    @ApiModelProperty("其他费用")
+    private BigDecimal otherAmount;
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java

@@ -20,6 +20,16 @@ public class AsBusrepairBillDetailsVo implements Vo {
     private String orgPath;
     @ApiModelProperty("应收金额")
     private String receivableAmount;
+    @ApiModelProperty("工时费")
+    private String hourAmount;
+    @ApiModelProperty("材料费")
+    private String goodsAmount;
+    @ApiModelProperty("外出费")
+    private String outAmount;
+    @ApiModelProperty("厂家补助")
+    private String subsidyAmount;
+    @ApiModelProperty("其他费用")
+    private String otherAmount;
     @ApiModelProperty("班组sid")
     private String groupSid;
     private String createDate;

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@@ -20,6 +20,16 @@ public class AsBusrepairBillDto implements Dto {
     private String orgPath;
     @ApiModelProperty("应收金额")
     private String receivableAmount;
+    @ApiModelProperty("工时费")
+    private String hourAmount;
+    @ApiModelProperty("材料费")
+    private String goodsAmount;
+    @ApiModelProperty("外出费")
+    private String outAmount;
+    @ApiModelProperty("厂家补助")
+    private String subsidyAmount;
+    @ApiModelProperty("其他费用")
+    private String otherAmount;
     @ApiModelProperty("班组sid")
     private String groupSid;
     @ApiModelProperty("班组名称")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java

@@ -70,4 +70,5 @@ public class AsBusrepairInventorybillDetailSDto {
     private String operUserSid;
     @ApiModelProperty("领料人姓名")
     private String operName;
+    private String remarks;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml

@@ -9,7 +9,8 @@
         b.billNo as sourceBillNo,
         a.createByName,
         a.busTypeValue,
-        a.warehouseManager
+        a.warehouseManager,
+        a.remarks
         from as_busrepair_inventorybill as a
         left join as_busrepair_bill as b on a.sourceBillSid = b.sid
         left join anrui_portal.sys_organization as s on a.deptSid = s.sid

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -356,6 +356,11 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                     for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) {
                         AsBusrepairInventorybillDetailSDto goodsDetailsVo = new AsBusrepairInventorybillDetailSDto();
                         BeanUtil.copyProperties(goodsDetail, goodsDetailsVo);
+                        if (null != goodsDetail.getCurrentCount()) {
+                            goodsDetailsVo.setOutboundCount(goodsDetail.getCurrentCount().toString());
+                        } else {
+                            goodsDetailsVo.setOutboundCount("0");
+                        }
                         list.add(goodsDetailsVo);
                     }
                     vo.setDetailList(list);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java

@@ -158,9 +158,9 @@ public class WmsOutBillService extends MybatisBaseService<WmsOutBillMapper, WmsO
                 String ruKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "1", record.getGoodsID()).getData();
                 BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));
                 if (null != count) {
-                    record.setOutboundCount("0");
-                } else {
                     record.setOutboundCount(count.toString());
+                } else {
+                    record.setOutboundCount("0");
                 }
             }
         }