From 873197abd3ae5e447f57683031cea6896f0cf2aa Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 十月 2022 13:01:15 +0800
Subject: [PATCH] 加入营销商品功能

---
 service-common/src/main/java/com/java110/common/cmd/carInoutDetail/ListCarInoutDetailCmd.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/cmd/carInoutDetail/ListCarInoutDetailCmd.java b/service-common/src/main/java/com/java110/common/cmd/carInoutDetail/ListCarInoutDetailCmd.java
index 6d93ad3..8c0d9d0 100644
--- a/service-common/src/main/java/com/java110/common/cmd/carInoutDetail/ListCarInoutDetailCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/carInoutDetail/ListCarInoutDetailCmd.java
@@ -18,7 +18,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.smo.IComputeFeeSMO;
 import com.java110.dto.machine.CarInoutDetailDto;
@@ -50,7 +50,7 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "carInoutDetail.listCarInoutDetail")
-public class ListCarInoutDetailCmd extends AbstractServiceCmdListener {
+public class ListCarInoutDetailCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(ListCarInoutDetailCmd.class);
     @Autowired
@@ -69,7 +69,11 @@
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
         CarInoutDetailDto carInoutDetailDto = BeanConvertUtil.covertBean(reqJson, CarInoutDetailDto.class);
-        carInoutDetailDto.setPaIds(getPaIds(reqJson));
+        if(reqJson.containsKey("boxId")) {
+            carInoutDetailDto.setPaIds(getPaIds(reqJson));
+        }else{
+            carInoutDetailDto.setPaId(reqJson.getString("paId"));
+        }
         int count = carInoutDetailV1InnerServiceSMOImpl.queryCarInoutDetailsCount(carInoutDetailDto);
 
         List<CarInoutDetailDto> carInoutDetailDtos = null;

--
Gitblit v1.8.0