Merge remote-tracking branch 'origin/master'

pom.xml

@@ -106,13 +106,13 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>DAGANG</user>
-                    <password>root123</password>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>OMSTRAIN_ORDER</param>-->
+                        <param>AMS_CONTAACT_PRICE_MATERIAL</param>-->
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/AmsContractTruckPriceController.java

@@ -344,6 +344,14 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         return success(amsContractTruckPriceService.insertLineNodePoint(map));
     }
 
+    @ApiOperation("根据汽运ID修改单价")
+    @PostMapping("updatePriceById")
+    public RESTfulResult updatePriceById(@RequestBody(required = false) Map<String,Object> map) {
+        //
+        int i = amsContractTruckPriceService.updatePriceById(map);
+        return success(i);
+    }
+
     @ApiOperation(value = "查询出收货地址ID")
     @PostMapping("/queryPlaceId")
     public BigDecimal queryPlaceId(@RequestBody(required = false) BigDecimal bigDecimal){
@@ -353,5 +361,6 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             b = (BigDecimal) map.get("PLACE_ID");
         }
         return b;
+
     }
 }

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -689,6 +689,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @ApiModelProperty(value = "新增钢材销售订单")
     @PostMapping("/addSteelSaleOrder")
     public RESTfulResult addSteelSaleOrder(@RequestBody Map<String,Object> mapValue){
+        System.out.println(mapValue);
         try {
             // 成功
             int result = amsSaleOrderService.addSteelSaleOrder(mapValue);
@@ -1339,4 +1340,25 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amsSaleOrderService.getKucunList(map);
         return success(mapList);
     }
+
+
+    @ApiOperation("批量新增销售订单")
+    @PostMapping("addSteelSaleOrderList")
+    public RESTfulResult addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
+        int count = 0;
+        String saleOrderNo = null;
+        System.out.println("------销售订单批量导入Excel导入-----");
+        System.out.println(mapList);
+        System.out.println("------销售订单批量导入Excel导入-----");
+        try {
+            for (Map<String,Object> map:mapList
+                 ) {
+                saleOrderNo = map.get("saleOrderNo").toString();
+                    count += amsSaleOrderService.addSteelSaleOrder(map);
+                }
+        } catch (Exception e) {
+            return failed("销售订单编号为:" + saleOrderNo + e.getMessage());
+        }
+        return success(count);
+    }
 }

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderMaterialController.java

@@ -291,5 +291,14 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
         return success(priceMap);
     }
 
+    @ApiOperation("批量保存内转钢材到异地库收货单位和发站")
+    @PostMapping("batchUpdateInwardConsignee")
+    public RESTfulResult batchUpdateInwardConsignee(@RequestBody List<Map<String,Object>> maplist){
+        int i = 0;
+        for(Map<String,Object> map : maplist){
+            i += amsSaleOrderMaterialService.updateInwardConsignee(map);
+        }
+        return success(i);
 
+    }
 }

src/main/java/com/steerinfo/dil/controller/AmstruckInwardRequirementController.java

@@ -193,7 +193,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             mapValue.put("enableStatus",enableStatus);
         }
         if(planStatus != null){
-            mapValue.put("planStatus",planStatus);
+            mapValue.put("planStatus",DataChange.dataToBigDecimal(planStatus));
         }
         if(con != null && !"null".equals(con)){
             mapValue.put("con","%" + con + "%");

src/main/java/com/steerinfo/dil/model/AmsContaactPriceMaterial.java

@@ -25,6 +25,12 @@ public class AmsContaactPriceMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="物资ID",required=false)
     private BigDecimal materialId;
 
+    /**
+     * 逻辑删除,0,未删除，1删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除,0,未删除，1删除",required=false)
+    private BigDecimal deleted;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -61,6 +67,14 @@ public class AmsContaactPriceMaterial implements IBasePO<BigDecimal> {
         this.materialId = materialId;
     }
 
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -70,6 +84,7 @@ public class AmsContaactPriceMaterial implements IBasePO<BigDecimal> {
         sb.append(", priceMaterialId=").append(priceMaterialId);
         sb.append(", priceId=").append(priceId);
         sb.append(", materialId=").append(materialId);
+        sb.append(", deleted=").append(deleted);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/IAmsContractTruckPriceService.java

@@ -60,4 +60,6 @@ public interface IAmsContractTruckPriceService {
 
     int insertLineNodePoint(Map<String, Object> map);
 
+    int updatePriceById(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/service/impl/AmsContractTruckPriceServiceImpl.java

@@ -593,6 +593,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
             amsContaactPriceMaterial.setId(amsContractTruckPriceMapper.selectPriceMaterialMaxId());
             amsContaactPriceMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
             amsContaactPriceMaterial.setPriceId(amsContractTransportPrice.getPriceId());
+            amsContaactPriceMaterial.setDeleted(new BigDecimal(0));
             i = amsContaactPriceMaterialMapper.insertSelective(amsContaactPriceMaterial);
         }
         return i;
@@ -653,4 +654,17 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         int i = rmsLineNodePointMapper.insertSelective(rmsLineNodePoint);
         return i;
     }
+
+    @Override
+    public int updatePriceById(Map<String, Object> map) {
+        int count = 0;
+        //获取单价ID
+        BigDecimal priceId = DataChange.dataToBigDecimal(map.get("priceId"));
+        //获取物资详ID
+        List<Map<String, Object>> materialTypeList = (List<Map<String,Object>>)map.get("materialTypeList");
+        for (Map<String,Object> materialTypeMap:materialTypeList){
+
+        }
+        return count;
+    }
 }

src/main/java/com/steerinfo/dil/service/impl/AmstruckInwardRequirementServiceImpl.java

@@ -100,7 +100,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
         amstruckInwardRequirement.setRequirementWorkEnvironment(requirementWorkEnvironment);
 
-        if (requirementEstimatedDuration!=null) {
+        if (requirementEstimatedDuration!=null && !requirementEstimatedDuration.equals("")) {
 
             amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
         }

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

src/main/resources/com/steerinfo/dil/mapper/AmsContaactPriceMaterialMapper.xml

@@ -5,12 +5,13 @@
     <id column="PRICE_MATERIAL_ID" jdbcType="DECIMAL" property="priceMaterialId" />
     <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
     <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
   </resultMap>
   <sql id="columns">
-    PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID
+    PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID, DELETED
   </sql>
   <sql id="columns_alias">
-    t.PRICE_MATERIAL_ID, t.PRICE_ID, t.MATERIAL_ID
+    t.PRICE_MATERIAL_ID, t.PRICE_ID, t.MATERIAL_ID, t.DELETED
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_CONTAACT_PRICE_MATERIAL
@@ -29,6 +30,9 @@
       <if test="materialId != null">
         and MATERIAL_ID = #{materialId}
       </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -42,6 +46,9 @@
       <if test="materialId != null">
         and MATERIAL_ID = #{materialId}
       </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -51,18 +58,21 @@
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from AMS_CONTAACT_PRICE_MATERIAL
     where 1!=1
-      <if test="priceId != null">
-        or PRICE_ID = #{priceId}
-      </if>
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
+    <if test="priceId != null">
+      or PRICE_ID = #{priceId}
+    </if>
+    <if test="materialId != null">
+      or MATERIAL_ID = #{materialId}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
-    insert into AMS_CONTAACT_PRICE_MATERIAL (PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID
-      )
-    values (#{priceMaterialId,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}
-      )
+    insert into AMS_CONTAACT_PRICE_MATERIAL (PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID,
+                                             DELETED)
+    values (#{priceMaterialId,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
+            #{deleted,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
     insert into AMS_CONTAACT_PRICE_MATERIAL
@@ -76,6 +86,9 @@
       <if test="materialId != null">
         MATERIAL_ID,
       </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="priceMaterialId != null">
@@ -87,12 +100,16 @@
       <if test="materialId != null">
         #{materialId,jdbcType=DECIMAL},
       </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
     update AMS_CONTAACT_PRICE_MATERIAL
     set PRICE_ID = #{priceId,jdbcType=DECIMAL},
-      MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+        DELETED = #{deleted,jdbcType=DECIMAL}
     where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
@@ -104,6 +121,9 @@
       <if test="materialId != null">
         MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
       </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
     </set>
     where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
   </update>
@@ -119,36 +139,41 @@
     <include refid="select" />
     <include refid="whereLike" />
   </select>
-
   <insert id="batchInsert" parameterType="java.util.List">
     insert into AMS_CONTAACT_PRICE_MATERIAL
-      (PRICE_MATERIAL_ID,
-      PRICE_ID, MATERIAL_ID)
+    (PRICE_MATERIAL_ID,
+    PRICE_ID, MATERIAL_ID, DELETED
+    )
     ( <foreach collection="list" item="item" separator="union all">
-   select
-      #{item.priceMaterialId,jdbcType=DECIMAL},
-      #{item.priceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL} from dual
-   </foreach> )
+    select
+    #{item.priceMaterialId,jdbcType=DECIMAL},
+    #{item.priceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.deleted,jdbcType=DECIMAL}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update AMS_CONTAACT_PRICE_MATERIAL
-     set
-       PRICE_MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
-          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceMaterialId,jdbcType=DECIMAL}
-       </foreach>
-       ,PRICE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
-          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
-          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-     where PRICE_MATERIAL_ID in
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.priceMaterialId,jdbcType=DECIMAL}
-     </foreach>
+    update AMS_CONTAACT_PRICE_MATERIAL
+    set
+    PRICE_MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+      when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceMaterialId,jdbcType=DECIMAL}
+    </foreach>
+    ,PRICE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+      when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+      when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+      when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    where PRICE_MATERIAL_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.priceMaterialId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from AMS_CONTAACT_PRICE_MATERIAL
@@ -172,5 +197,6 @@
     RMT.MATERIAL_ISINWARD = 1
     AND
     PRICE_ID = #{priceId}
+    AND ACPR.DELETED = 0
   </select>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -919,6 +919,7 @@
       on rtr.trans_range_id = actp.line_id
       where type = #{type}
       and actp.DELETED = 0
+      and acpm.DELETED = 0
       <if test="rangeId != null">
         and actp.LINE_ID = #{rangeId}
       </if>

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -1499,14 +1499,11 @@
 
   <select id="getSaleOrderInfoes" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
-    select a_s_order.SALE_ORDER_ID "saleOrderId",
+    SELECT a_s_order.SALE_ORDER_ID "saleOrderId",
     a_s_order.SALE_NUMBER "saleNumber",
     r_shipper.SHIPPER_NAME "shipperName",
     r_consignee.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
     a_s_order.SALE_ORDER_ISSELF_MENTION "saleOrderIsselfMention",
-    a_s_order.SALE_ACCOUNT_BALANCE "saleAccountBalance",
-    a_s_order.SALE_CURRENT_ORDER_AMOUNT "saleCurrentOrderAmount",
-    a_s_order.SALE_HISTORICAL_ORDER_AMOUNT "saleHistoricalOrderAmout",
     a_s_order.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
     a_s_order.SALE_UNIT_PRICE "saleUnitPrice",
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
@@ -1518,13 +1515,17 @@
     ASM.MATERIAL_NUMBER "materialNumber",
     RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
-    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
-    ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId"
-    from AMS_SALE_ORDER a_s_order
-    left join RMS_SHIPPER r_shipper
-    on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
-    left join RMS_CONSIGNEE r_consignee
-    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
+    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
+    RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+    ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId",
+    decode(ASM.IS_POUND_SALE, 0, '是' , '否') "isPoundSale",
+    ASOM.TRUCK_REMARK "trucRemark",
+    ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel"
+    FROM AMS_SALE_ORDER a_s_order
+    LEFT JOIN RMS_SHIPPER r_shipper
+    ON a_s_order.SHIPPER_ID = r_shipper.SHIPPER_ID
+    LEFT JOIN RMS_CONSIGNEE r_consignee
+    ON a_s_order.RECEIVE_ID = r_consignee.CONSIGNEE_ID
     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
     ON ASOM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_RECEIVE_PLACE RRP
@@ -1539,8 +1540,9 @@
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     LEFT JOIN RMS_SALER R_SALER
     ON R_SALER.SALER_ID = a_s_order.SALER_ID
-    where a_s_order.SALE_ORDER_STATUS=0 and a_s_order.DELETED=0
-    and ASM.DELETED IS NULL
+    WHERE a_s_order.SALE_ORDER_STATUS = 0
+    AND a_s_order.DELETED = 0
+    AND ASM.DELETED IS NULL
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
@@ -1601,42 +1603,12 @@
           "saleOrderIsselfMention" like '%${item}%'
         </foreach>
       </if>
-      <if test="saleAccountBalance != null">
-        and
-        <foreach collection="saleAccountBalance" item="item" open="(" separator="or" close=")">
-          "saleAccountBalance" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        and
-        <foreach collection="saleCurrentOrderAmount" item="item" open="(" separator="or" close=")">
-          "saleCurrentOrderAmount" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="saleHistoricalOrderAmout != null">
-        and
-        <foreach collection="saleHistoricalOrderAmout" item="item" open="(" separator="or" close=")">
-          "saleHistoricalOrderAmout" like '%${item}%'
-        </foreach>
-      </if>
       <if test="saleOrderReceiveCustomer != null">
         and
         <foreach collection="saleOrderReceiveCustomer" item="item" open="(" separator="or" close=")">
           "saleOrderReceiveCustomer" like '%${item}%'
         </foreach>
       </if>
-      <if test="saleUnitPrice != null">
-        and
-        <foreach collection="saleUnitPrice" item="item" open="(" separator="or" close=")">
-          "saleUnitPrice" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="saleOrderTax != null">
-        and
-        <foreach collection="saleOrderTax" item="item" open="(" separator="or" close=")">
-          "saleOrderTax" like '%${item}%'
-        </foreach>
-      </if>
       <if test="saleRemark != null">
         and
         <foreach collection="saleRemark" item="item" open="(" separator="or" close=")">
@@ -2281,6 +2253,7 @@
     on o_order.order_id=t_t_result.order_id
     left join Tmstruck_Weight_Result t_w_result
     on t_t_result.result_total_id=t_w_result.result_total_id
+    where o_order.ORDER_TYPE=2
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
     ) sumWeight
@@ -2297,6 +2270,7 @@
     left join OMSTRUCK_ORDER_MATERIAL o_o_material
     on o_order.order_id=o_o_material.ORDER_ID
     where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status in (2,4,5)
+    AND o_order.ORDER_TYPE=2
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
     ) sumWeight2
@@ -2311,6 +2285,7 @@
     left join Tmstruck_Weight_Result t_w_result
     on t_t_result.result_total_id=t_w_result.result_total_id
     where o_order.order_status in (2,4,5)
+    AND o_order.ORDER_TYPE=2
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
 

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.xml

@@ -1298,7 +1298,7 @@
         RW1.WAREHOUSE_NAME        "loadPointName",
         rm.material_id            "materialId",
         AIP.PLAN_STATUS           "planStatus",
-        RM.MATERIAL_NAME          "materialName",
+        RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL         "materialName",
         RCR.CARRIER_NAME          "carrierName",
         AIP.PLAN_EABLE_STATUS     "enable",
         AIP.PLAN_EABLE_STATUS     "enable1",
@@ -1349,10 +1349,10 @@
         <if test="planStatus != null">
             and AIP.PLAN_STATUS = #{planStatus}
         </if>
-        <if test="oneDate != null and planStatus !=3">
+        <if test="oneDate != null and planStatus != 2 and planStatus != 3  ">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
         </if>
-        <if test="startDate != null and planStatus !=3">
+        <if test="startDate != null and planStatus != 2 and planStatus != 3 ">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.INSERT_TIME
         </if>