优化

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -1392,27 +1392,27 @@ public class YongyouServiceImpl implements YongyouService {
         req.setStrWhere(whereStr.toString());
         handler.setRequest(req);
         String responseStr = handler.handler();
-        GetCurrentStockResponse response = JSONObject.parseObject(responseStr, GetCurrentStockResponse.class);
+        GetCurrentStockResponse2 response = JSONObject.parseObject(responseStr, GetCurrentStockResponse2.class);
         if (!response.getResult()) {
             throw new BusinessException(response.getMsg());
         }
-        GetCurrentStockResponseData data = response.getData();
-        List<GetCurrentStock> stocks = data.getStock();
+        GetCurrentStockResponseData2 data = response.getData();
+        List<GetCurrentStock2> stocks = data.getInventory();
         List<SpareStoreVO> partInfoVOS = new ArrayList<>();
-        for (GetCurrentStock stockResponse : stocks) {
+        for (GetCurrentStock2 stockResponse : stocks) {
             SpareStoreVO partInfoVO = new SpareStoreVO();
-            partInfoVO.setId(stockResponse.getAutoId() + "");
+//            partInfoVO.setId(stockResponse.getAutoId() + "");
             partInfoVO.setNo(stockResponse.getCInvCode());
-            partInfoVO.setSpareId(stockResponse.getPartId() + "");
+//            partInfoVO.setSpareId(stockResponse.getPartId() + "");
             partInfoVO.setSpareName(stockResponse.getCInvName());
             partInfoVO.setGgxh(stockResponse.getCInvStd());
-            partInfoVO.setNum(stockResponse.getIQuantity());
-            partInfoVO.setStoreName(stockResponse.getCWhName());
-            partInfoVO.setStoreId(stockResponse.getCWhCode());
-            partInfoVO.setUnit(stockResponse.getCComUnitName());
-            partInfoVO.setCBatch(stockResponse.getCBatch());
-            partInfoVO.setAutoId(stockResponse.getAutoId());
-            partInfoVO.setStorePosition(stockResponse.getCInvDefine1());
+//            partInfoVO.setNum(stockResponse.getIQuantity());
+//            partInfoVO.setStoreName(stockResponse.getCWhName());
+//            partInfoVO.setStoreId(stockResponse.getCWhCode());
+//            partInfoVO.setUnit(stockResponse.getCComUnitName());
+//            partInfoVO.setCBatch(stockResponse.getCBatch());
+//            partInfoVO.setAutoId(stockResponse.getAutoId());
+//            partInfoVO.setStorePosition(stockResponse.getCInvDefine1());
             partInfoVOS.add(partInfoVO);
         }
 

platform-service/src/main/java/handler/yongyou/GetCurrentStockResponseData2.java

@@ -0,0 +1,23 @@
+package handler.yongyou;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import handler.yongyou.response.BaseResponse;
+import handler.yongyou.response.GetCurrentStock;
+import handler.yongyou.response.GetCurrentStock2;
+import lombok.Data;
+
+import java.util.List;
+
+;//
+
+/**
+ * 现存量查询响应
+ */
+@Data
+public class GetCurrentStockResponseData2 extends BaseResponse {
+
+    Integer total;// 总数
+    Double pages;// 总页数
+    @JSONField(name ="Inventory")
+    List<GetCurrentStock2> Inventory;
+}

platform-service/src/main/java/handler/yongyou/response/GetCurrentStock2.java

@@ -0,0 +1,88 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+import org.omg.CORBA.INTERNAL;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+;//
+
+/**
+ * 现存量查询响应
+ */
+@Data
+public class GetCurrentStock2 extends BaseResponse {
+    private String cInvCode; //存货编码
+//    private String cInvAddCode; //存货代码
+    private String cInvName; //存货名称
+    private String cInvStd; //规格型号
+//    private String cInvCCode; //存货分类编码
+//    private String fInvCIQExch;
+//    private String cGroupCode; //计量单位组编码
+//    private String cInvMnemCode; //助记码
+//    private Boolean bInvEntrust; ;//是否受托代销
+//    private Boolean bPiece; //计件
+//    private Boolean bSale; //是否内销
+//    private Boolean bSuitRetail;
+//    private Boolean bCoupon;
+//    private Boolean bStoreCard;
+//    private Boolean bProcessProduct;
+//    private Boolean bProcessMaterial;
+//    private Boolean bExpSale; //是否外销
+//    private Boolean bPurchase; //是否采购
+//    private Boolean bImport; //是否进口药品
+//    private Boolean bSelf; //是否自制
+//    private Boolean bComsume; //是否生产耗用
+//
+//
+//    private String cComUnitCode; //主计量单位编码
+//    private String cPUComUnitCode; ; //采购默认计量单位编码
+//    private String cSAComUnitCode; ;//销售默认计量单位编码
+//    private String cSTComUnitCode; //库存默认计量单位编码
+//    private Integer iGroupType; ;//计量单位组类别
+//    private String cProductUnit; ;//生产计量单位
+//    private String cShopUnit; //零售计量单位
+//    private String cValueType; //计价方式
+//    private String cSRPolicy; ;// 生产日期 null
+//    private String cPlanMethod; ;// 调拨在途辅计量数0
+//    private Integer iRequireTrackStyle; ;// 调拨待发数量0
+//    private Integer iBOMExpandUnitType; ;// 调拨待发辅计量数量0
+//    private Integer iSupplyPeriodType; ;// 保质期天数null
+//    private Integer iAvailabilityDate; ;// 保质期单位null
+//    private Integer fMinSupply; ;// 冻结数量0
+//    private Integer fRoundFactor; ;// 冻结件数0
+//    private Integer fConvertRate; ;// 最后检验日期null
+//    private Integer iAcceptEarlyDays; ;// 有效期推算方式null
+//    private String cExpirationdate; ;// 有效期至null
+//    private String dExpirationdate; ;// 有效期计算项null
+//    private BigDecimal ipeqty; ;// pe预留数量0
+//    private BigDecimal ipenum; ;// pe预留件数0
+//    private String cBatchProperty1; ;// 批次属性1
+//    private String cBatchProperty2; ;// 批次属性
+//    private String cBatchProperty3; ;// 批次属性
+//    private String cBatchProperty4; ;// 批次属性
+//    private String cBatchProperty5; ;// 批次属性
+//    private String cBatchProperty6; ;// 批次属性
+//    private String cBatchProperty7; ;// 批次属性
+//    private String cBatchProperty8; ;// 批次属性
+//    private String cBatchProperty9; ;// 批次属性
+//    private String cBatchProperty10; ;// 批次属性
+//
+//    private String cInvDefine1  ; //存库位的
+//    private String cInvDefine2  ;
+//    private String cInvDefine3  ;
+//    private String cInvDefine4  ;
+//    private String cInvDefine5  ;
+//    private String cInvDefine6  ;
+//    private String cInvDefine7  ;
+//    private String cInvDefine8  ;
+//    private String cInvDefine9  ;
+//    private String cInvDefine10  ;
+//    private String cInvDefine11  ;
+//    private String cInvDefine12 ;
+//    private String cInvDefine13  ;
+//    private String cInvDefine14  ;
+//    private String cInvDefine15  ;
+//    private String cInvDefine16  ;
+}

platform-service/src/main/java/handler/yongyou/response/GetCurrentStockResponse2.java

@@ -0,0 +1,12 @@
+package handler.yongyou.response;
+
+import handler.yongyou.GetCurrentStockResponseData2;
+import lombok.Data;
+
+/**
+ * 现存量查询响应
+ */
+@Data
+public class GetCurrentStockResponse2 extends BaseResponse {
+    GetCurrentStockResponseData2 data;
+}