فهرست منبع

原矿订单新增卸货数据

donglang 2 هفته پیش
والد
کامیت
4ac2643cc5

+ 17 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/forklift/reponse/GatekeeperOrderResp.java

@@ -227,5 +227,22 @@ public class GatekeeperOrderResp implements Serializable {
     @Schema(description = "货损率是否超过千分之三")
     private Boolean isPassReason;
 
+    /**
+     * 皮重
+     */
+    @Schema(description = "卸货皮重")
+    private BigDecimal unloadingTareAmount;
+
+    /**
+     * 毛重
+     */
+    @Schema(description = "卸货毛重")
+    private BigDecimal unloadingGrossAmount;
+
+    /**
+     * 卸货净重
+     */
+    @Schema(description = "卸货净重")
+    private BigDecimal unloadAmount;
 
 }

+ 3 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/GatekeeperOrderService.java

@@ -439,6 +439,9 @@ public class GatekeeperOrderService {
             //卸货净重
             KwtWaybillOrderTicket unloadTicket = waybillOrderTicketMap.getOrDefault(gatekeeperWaybillOrder.getWOrderId() + "-" + 2, new KwtWaybillOrderTicket());
             BigDecimal unloadAmount = unloadTicket.getAmount();
+            gatekeeper.setUnloadAmount(unloadAmount);
+            gatekeeper.setUnloadingTareAmount(unloadTicket.getTareAmount());
+            gatekeeper.setUnloadingGrossAmount(unloadTicket.getGrossAmount());
 
             //计算货损率
             BigDecimal lossRate = calculateLossRate(loadAmount, unloadAmount);