1/3 龙海优化1.0

src/main/java/com/glxp/mipsdl/client/lhzyy/LhzyyClient.java

@@ -198,8 +198,8 @@ public class LhzyyClient extends CommonHttpClient {
             dsOrderRequest.setLocInvCode(thrInvWarehouseEntity.getCode());
             dsOrderRequest.setLocInvName(thrInvWarehouseEntity.getName());
 
-            dsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode());
-            dsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName());
+//            dsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode());
+//            dsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName());
         } catch (Exception e) {
             log.info("查询第三方系统仓库信息异常", e);
         }
@@ -259,7 +259,26 @@ public class LhzyyClient extends CommonHttpClient {
                         .eq(ThrProductsEntity::getCode, basicUdirel.getThirdId()).last("limit 1"));
                 item.setRegisterNo(thrProductsEntity.getRegisterNo());
             }
-
+            if (StrUtil.isNotBlank(detailBizEntity.getSecSalesInvNo())){
+                item.setSecSalesInvNo(detailBizEntity.getSecSalesInvNo());
+            }else {
+                item.setSecSalesInvNo("");
+            }
+            if (StrUtil.isNotBlank(detailBizEntity.getInvoiceDate())){
+                item.setInvoiceDate(detailBizEntity.getInvoiceDate());
+            }else {
+                item.setInvoiceDate("");
+            }
+            if (StrUtil.isNotBlank(detailBizEntity.getSecSalesListNo())){
+                item.setSecSalesListNo(detailBizEntity.getSecSalesListNo());
+            }else {
+                item.setSecSalesListNo("");
+            }
+            if (StrUtil.isNotBlank(detailBizEntity.getFirstSalesInvNo())){
+                item.setFirstSalesInvNo(detailBizEntity.getFirstSalesInvNo());
+            }else {
+                item.setFirstSalesInvNo("");
+            }
             //封装条码信息
             submitOrderUtil.setCodeList(ioCodeEntities, detailBizEntity, item);
             orderDetailRequests.add(item);

src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderDetailRequest.java

@@ -141,6 +141,7 @@ public class UdiwmsOrderDetailRequest {
     private String cplb;
     private String diCode;
     private String hslb;
+    private String ybbm;
 
     /**
      * 码明细

src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java

@@ -123,17 +123,46 @@ public class SubmitOrderUtil {
             return null;
         }
         item.setProductName(thrProductsEntity.getName()); //产品名称
-        item.setBindRlFk(detailBizEntity.getBindRlFk());
+//        item.setBindRlFk(detailBizEntity.getBindRlFk());
         item.setStandard(detailBizEntity.getSpec()); //规格型号
         item.setBillNo(detailBizEntity.getOrderIdFk()); //单据号
         item.setRegisterNo(detailBizEntity.getCertCode()); //注册/备案证号
         item.setManufactory(basicProducts.getManufactory()); //生产厂家
         item.setMeasname(basicProducts.getMeasname()); //计量单位
-        item.setAllowNoBatch(IntUtil.value(basicProducts.getAllowNoBatch())); //是否允许无批次号
-        item.setManufactoryCode(thrProductsEntity.getManufactoryCode());
-        item.setSupCode(thrProductsEntity.getSupCode());
-        item.setCplb(thrProductsEntity.getFlbm());
-        item.setHslb(thrProductsEntity.getCplb());
+        if (StrUtil.isEmpty(detailBizEntity.getRemark())){
+            item.setRemark("");
+        }else {
+            item.setRemark(detailBizEntity.getRemark());
+        }
+        if (StrUtil.isEmpty(detailBizEntity.getRemark1())){
+            item.setRemark1("");
+        }else {
+            item.setRemark1(detailBizEntity.getRemark1());
+        }
+
+        if (StrUtil.isEmpty(detailBizEntity.getRemark2())){
+            item.setRemark2("");
+        }else {
+            item.setRemark2(detailBizEntity.getRemark2());
+        }
+
+        if (StrUtil.isEmpty(detailBizEntity.getRemark3())){
+            item.setRemark3("");
+        }else {
+            item.setRemark3(detailBizEntity.getRemark3());
+        }
+
+        if (StrUtil.isEmpty(basicProducts.getYbbm())){
+            item.setYbbm("");
+        }else {
+            item.setYbbm(basicProducts.getYbbm());
+        }
+
+//        item.setAllowNoBatch(IntUtil.value(basicProducts.getAllowNoBatch())); //是否允许无批次号
+//        item.setManufactoryCode(thrProductsEntity.getManufactoryCode());
+//        item.setSupCode(thrProductsEntity.getSupCode());
+//        item.setCplb(thrProductsEntity.getFlbm());
+//        item.setHslb(thrProductsEntity.getCplb());
         item.setCount(detailBizEntity.getCount());
         return item;
     }