Merge remote-tracking branch 'origin/pre-production'

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/controller/OrderController.java

@@ -1,6 +1,7 @@
 package com.logpm.factorydata.suofeiya.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.factorydata.suofeiya.service.DeliveryNoteService;
@@ -64,9 +65,12 @@ public class OrderController {
 		log.info("接收工厂订单：{} ", jsonStr);
 		String res = "";
 		try {
-			DeliveryNoteVO params = vo.getParams();
-			if (ObjectUtil.isNotEmpty(params)) {
-				res = service.order(params);
+			String params = vo.getParams();
+			if(StrUtil.isNotEmpty(params)){
+				DeliveryNoteVO bean = JSONUtil.toBean(params, DeliveryNoteVO.class);
+				if (ObjectUtil.isNotEmpty(bean)) {
+					res = service.order(bean);
+				}
 			}
 		} catch (Exception e) {
 			log.error("工厂订单异常：{} ", e);

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/vo/FactoryOrderDataVO.java

@@ -22,6 +22,6 @@ public class FactoryOrderDataVO  {
 	private String companyCode;
 
 	@ApiModelProperty("订单信息")
-	private DeliveryNoteVO params;
+	private String params;
 
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -513,12 +513,9 @@
                ltad.weight weight,
                ltad.volume volume,
                lbfc1.category_id incomeCategoryId,
-               IFNULL(lbfc1.category,'其他') incomeCategoryName,
-               lbfc2.category_id costCategoryId,
-               IFNULL(lbfc2.category,'其他') costCategoryName
+               IFNULL(lbfc1.category,'其他') incomeCategoryName
         from logpm_trunkline_advance_detail ltad
         left join logpm_basicdata_factory_category lbfc1 on lbfc1.brand = ltad.brand and IFNULL(lbfc1.firsts,1) = IFNULL(ltad.first_pack_name,1) and IFNULL(lbfc1.seconds,2) = IFNULL(ltad.second_pack_name,2) and IFNULL(lbfc1.thirds,3) = IFNULL(ltad.third_pack_name,3) and lbfc1.type = 1 AND IFNULL(lbfc1.materiel_name,4) = IFNULL(ltad.material_name,4) AND lbfc1.is_deleted = 0
-        left join logpm_basicdata_factory_category lbfc2 on lbfc2.brand = ltad.brand and IFNULL(lbfc2.firsts,1) = IFNULL(ltad.first_pack_name,1) and IFNULL(lbfc2.seconds,2) = IFNULL(ltad.second_pack_name,2) and IFNULL(lbfc2.thirds,3) = IFNULL(ltad.third_pack_name,3) and lbfc1.type = 2 AND IFNULL(lbfc2.materiel_name,4) = IFNULL(ltad.material_name,4) AND lbfc2.is_deleted = 0
         where ltad.is_deleted = 0
         <if test="param.advanceIds != null and param.advanceIds.size() > 0">
             and ltad.advance_id in