'采购和销售'

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

@@ -43,7 +43,14 @@ public class AmsPurchaseOrderController extends BaseRESTfulController {
     public RESTfulResult getPurchaseOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer apiId) {
+                                              Integer apiId,
+                                              String con) {
+        if (con != null && (con.equals("null") || con.equals("undefined"))) {
+            con = null;
+        }
+        if (con != null) {
+            mapValue.put("con", "%" + con + "%");
+        }
         List<Map<String, Object>> list = amsPurchaseOrderService.getPurchaseOrderList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据

src/main/java/com/steerinfo/dil/mapper/AmsDispatchSaleOrderMapper.java

@@ -42,5 +42,5 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
     List<Map<String, Object>> getDispatchMaterialList(BigDecimal dispatchId);
 
     // 通过ssoid查询承运商
-    List<Map<String, Object>> getCarrierIdBySSO(String carrierSsoId);
+    List<Map<String, Object>> getCarrierIdBySSO(Map<String,Object> map);
 }

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -71,4 +71,10 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     // 销售焦炭订单
     List<Map<String, Object>> getCokeSaleOrderList(Map<String,Object> mapValue);
+
+    // 得到销售订单已计量的重量
+    BigDecimal getNetWeight(BigDecimal saleOrderId);
+
+    // 得到销售订单已分配的车数
+    BigDecimal getCarNum(BigDecimal saleOrderId);
 }

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

@@ -152,7 +152,9 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
      */
     @Override
     public int lockDispatchSaleOrder(BigDecimal dispatchId, String carrierSsoId) {
-        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        Map<String,Object> map = new HashMap<>();
+        map.put("carrierSsoId",carrierSsoId);
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(map);
         AmsDispatchSaleOrder amsDispatchSaleOrder = amsDispatchSaleOrderMapper.selectByPrimaryKey(dispatchId);
         amsDispatchSaleOrder.setDispatchDealTime(new Date());
         if (carrierIdList != null && carrierIdList.size() == 1) {
@@ -257,8 +259,8 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
      */
     @Override
     public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> mapValue) {
-        String carrierSsoId = (String) mapValue.get("carrierSsoId");
-        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+//        String carrierSsoId = (String) mapValue.get("carrierSsoId");
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(mapValue);
         if (carrierIdList != null && carrierIdList.size() == 1) {
             BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
             mapValue.put("carrierId", carrierId);
@@ -351,7 +353,7 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
     @Override
     public List<Map<String, Object>> getPCDispatchSaleOrderList(Map<String, Object> mapValue) {
         String carrierSsoId = (String) mapValue.get("carrierSsoId");
-        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(mapValue);
         if (carrierIdList != null && carrierIdList.size() == 1) {
             BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
             mapValue.put("carrierId", carrierId);
@@ -498,7 +500,7 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
     @Override
     public int lockDispatchSaleOrderList(Map<String, Object> mapValue) {
         String carrierSsoId = (String) mapValue.get("carrierSsoId");
-        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(mapValue);
         BigDecimal carrierId = null;
         if (carrierIdList != null && carrierIdList.size() == 1) {
             carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");

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

@@ -413,6 +413,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         for (Map<String, Object> resultMap : resultList) {
             BigDecimal saleOrderId = (BigDecimal) resultMap.get("saleOrderId");
             Map<String,Object> loserMap = new HashMap<>();
+            BigDecimal netWeight = amsSaleOrderMapper.getNetWeight(saleOrderId);
+            BigDecimal carNum = amsSaleOrderMapper.getCarNum(saleOrderId);
             loserMap.put("saleOrderId",saleOrderId);
             loserMap.put("con",map.get("con"));
             // 物资
@@ -434,6 +436,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
 //            }
             statusStr = saleOrderStatus.intValue() == 2 ? "销售公司已审批" : "财务已审批";
             resultMap.put("statusStr",statusStr);
+            resultMap.put("netWeight",netWeight);
+            resultMap.put("carNum",carNum);
         }
         return resultList;
     }

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

@@ -650,12 +650,13 @@
         WHERE ADSO.DISPATCH_ID = #{dispatchId}
     </select>
 
-    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="java.util.Map" >
+    <select id="getCarrierIdBySSO" resultType="java.util.Map" >
         SELECT
-            RC.CARRIER_ID AS "carrierId"
+            RC.CARRIER_ID AS "carrierId",
+            RC.CARRIER_SSO_ID AS "carrierSsoId"
         FROM RMS_CARRIER RC
         <if test="carrierSsoId != null" >
-            WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+            WHERE RC.CARRIER_SSO_ID = #{carrierSsoId,jdbcType=VARCHAR}
         </if>
     </select>
 </mapper>

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

@@ -506,7 +506,8 @@
     apo.PUCHASE_ORDER_MATERIAL_NUMBER as "purChaseOrderMaterialNumber",
     rsr.SHIPPER_NAME as "receiverName",
     apo.PUCHASE_ORDER_DELIVERY_DATE as "purchaseOrderDeliveryDate",
-    apo.INSERT_UPDATE_REMARK as "insertUpdateRemark"
+    apo.INSERT_UPDATE_REMARK as "insertUpdateRemark",
+    apo.PURCHASE_ORDER_ID as "purchaseOrderId"
     FROM AMS_PURCHASE_ORDER apo
     LEFT JOIN DIL_BATCH db
     ON apo.BATCH_ID = db.BATCH_ID
@@ -518,6 +519,9 @@
     ON apo.PURCHASING_ORGANIZATION_ID = rsb.SHIPPER_ID
     LEFT JOIN RMS_SHIPPER rsr
     ON apo.RECEIVE_UNIT_ID = rsr.SHIPPER_ID
+    <if test="con != null" >
+      WHERE apo.PURCHASE_ORDER_NO like #{con}
+    </if>
     )
     <where>
       <if test="purchaseOrderNo!= null">

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

@@ -1648,7 +1648,8 @@
     left join RMS_MATERIAL RM
     on RM.MATERIAL_ID = ASM.MATERIAL_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
-    and a_s_order.CLOSE_STATUS is not null) SSSR
+    and a_s_order.CLOSE_STATUS is not null
+    and a_s_order.DELETED = 0) SSSR
     <if test="con != null" >
       where SSSR."consigneeCompanyName" LIKE #{con}
     </if>
@@ -1764,93 +1765,94 @@
     left join RMS_CONSIGNEE r_consignee
     on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
-    and a_s_order.CLOSE_STATUS is null) SSSR
-    <if test="con != null" >
+    and a_s_order.CLOSE_STATUS is null
+    and a_s_order.DELETED = 0) SSSR
+    <if test="con != null">
       where SSSR."consigneeCompanyName" LIKE #{con}
     </if>
-    <if test="con != null" >
+    <if test="con != null">
       or SSSR."saleNumber" LIKE #{con}
     </if>
-    <!--    <where>-->
-    <!--      <if test="saleNumber != null">-->
-    <!--        and-->
-    <!--        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">-->
-    <!--          "saleNumber" like '%${item}%'-->
-    <!--        </foreach>-->
-    <!--      </if>-->
-    <!--      <if test="shipperName != null">-->
-    <!--        and-->
-    <!--        <foreach collection="shipperName" item="item" open="(" separator="or" close=")">-->
-    <!--          "shipperName" like '%${item}%'-->
-    <!--        </foreach>-->
-    <!--      </if>-->
-    <!--      <if test="consigneeCompanyName != null">-->
-    <!--        and-->
-    <!--        <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">-->
-    <!--          "consigneeCompanyName" like '%${item}%'-->
-    <!--        </foreach>-->
-    <!--      </if>-->
-    <!--      <if test="consigneeWarrantyAmount != null">-->
-    <!--        and-->
-    <!--        <foreach collection="consigneeWarrantyAmount" item="item" open="(" separator="or" close=")">-->
-    <!--          "consigneeWarrantyAmount" like '%${item}%'-->
-    <!--        </foreach>-->
-    <!--      </if>-->
-    <!--      <if test="consigneeWarrantyWeight != null">-->
-    <!--        and-->
-    <!--        <foreach collection="consigneeWarrantyWeight" item="item" open="(" separator="or" close=")">-->
-    <!--          "consigneeWarrantyWeight" like '%${item}%'-->
-    <!--        </foreach>-->
-    <!--      </if>-->
-    <!--      <if test="saleOrderIsselfMention != null">-->
-    <!--        and-->
-    <!--        <foreach collection="saleOrderIsselfMention" item="item" open="(" separator="or" close=")">-->
-    <!--          "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=")">-->
-    <!--          "saleRemark" like '%${item}%'-->
-    <!--        </foreach>-->
-    <!--      </if>-->
-    <!--    </where>-->
+<!--    <where>-->
+<!--          <if test="saleNumber != null">-->
+<!--            and-->
+<!--            <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">-->
+<!--              "saleNumber" like '%${item}%'-->
+<!--            </foreach>-->
+<!--          </if>-->
+<!--          <if test="shipperName != null">-->
+<!--            and-->
+<!--            <foreach collection="shipperName" item="item" open="(" separator="or" close=")">-->
+<!--              "shipperName" like '%${item}%'-->
+<!--            </foreach>-->
+<!--          </if>-->
+<!--          <if test="consigneeCompanyName != null">-->
+<!--            and-->
+<!--            <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">-->
+<!--              "consigneeCompanyName" like '%${item}%'-->
+<!--            </foreach>-->
+<!--          </if>-->
+<!--          <if test="consigneeWarrantyAmount != null">-->
+<!--            and-->
+<!--            <foreach collection="consigneeWarrantyAmount" item="item" open="(" separator="or" close=")">-->
+<!--              "consigneeWarrantyAmount" like '%${item}%'-->
+<!--            </foreach>-->
+<!--          </if>-->
+<!--          <if test="consigneeWarrantyWeight != null">-->
+<!--            and-->
+<!--            <foreach collection="consigneeWarrantyWeight" item="item" open="(" separator="or" close=")">-->
+<!--              "consigneeWarrantyWeight" like '%${item}%'-->
+<!--            </foreach>-->
+<!--          </if>-->
+<!--          <if test="saleOrderIsselfMention != null">-->
+<!--            and-->
+<!--            <foreach collection="saleOrderIsselfMention" item="item" open="(" separator="or" close=")">-->
+<!--              "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=")">-->
+<!--              "saleRemark" like '%${item}%'-->
+<!--            </foreach>-->
+<!--          </if>-->
+<!--        </where>-->
     <include refid="orderBy"></include>
   </select>
 
@@ -2036,4 +2038,19 @@
       AND RM.MATERIAL_NAME LIKE #{con}
     </if>
   </select>
+
+  <select id="getNetWeight" parameterType="DECIMAL" resultType="DECIMAL">
+    SELECT SUM(twr.RESULT_NET_WEIGHT)
+    FROM AMS_SALE_ORDER_MATERIAL asom
+           left join OMSTRUCK_ORDER oo on oo.ORDER_PLAN_ID = asom.SALE_ORDER_MATERIAL_ID
+           left join TMSTRUCK_TOTAL_RESULT ttr on ttr.ORDER_ID = oo.ORDER_ID
+           left join TMSTRUCK_WEIGHT_RESULT twr on twr.RESULT_TOTAL_ID = ttr.RESULT_TOTAL_ID
+    where asom.sale_order_id = #{saleOrderId}
+  </select>
+
+  <select id="getCarNum" parameterType="DECIMAL" resultType="DECIMAL">
+    SELECT COUNT(ASOM.SALE_ORDER_MATERIAL_ID)
+    FROM AMS_SALE_ORDER_MATERIAL ASOM
+    WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+  </select>
 </mapper>