Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -293,6 +293,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (fuelOrder != null) {
             mapValue.put("fuelOrder", fuelOrder);
         }
+        if (con != null||"null".equals(con)) {
+            mapValue.put("con", con);
+        }
         if(carrierSSOId != null){
             if(!"null".equals(carrierSSOId)) {
                 mapValue.put("carrierSSOId", carrierSSOId);

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

@@ -230,10 +230,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         String orgCode =(String) map.get("orgCode");
+        String userId = (String) map.get("userId");
         if (orgCode!=null){
            omstruckOrder.setOptionerCode(orgCode);
-        }else {
-            return null;
         }
         //生成订单主键Id
         BigDecimal maxId = omstruckOrderMapper.selectMaxId();
@@ -279,7 +278,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         //添加订单类型
         omstruckOrder.setOrderType(orderType);
-        omstruckOrder.setInsertUsername("admin");
+        omstruckOrder.setInsertUsername(userId);
         omstruckOrder.setInsertTime(new Date());
         return omstruckOrder;
     }
@@ -650,9 +649,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId"));
         BigDecimal orderType = DataChange.dataToBigDecimal(mapValue.get("orderType"));
         String orgCode =(String) mapValue.get("orgCode");
-        if (orgCode==null||orgCode.equals("")){
-            return -1;
-        }
         AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
         amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
         result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
@@ -684,7 +680,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setUpdateTime(new Date());
             omstruckOrder.setInsertUsername("admin");
             omstruckOrder.setUpdateUsername("admin");
-            omstruckOrder.setOptionerCode(orgCode);
+            if(orgCode!=null) {
+                omstruckOrder.setOptionerCode(orgCode);
+            }
             omstruckOrder.setInsertUpdateRemark("无");
             omstruckOrder.setDeleted(new BigDecimal(0));
             omstruckOrder.setOrderType(orderType);
@@ -2010,7 +2008,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 15:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
-                mesMap.put("loadName","老区轨道衡");
+                mesMap.put("loadName","铁专线—五线");
+                mesMap.put("inwardType","拼装车皮进厂");
                 break;
             case 16:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
@@ -2018,11 +2017,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
-                mesMap.put("inwardType", "计重");
+                mesMap.put("inwardType", "内转计重");
                 break;
             case 21:
                 mesMap = omstruckOrderMapper.getInwardTimeOrderMessageToApp(map);
-                mesMap.put("inwardType", "计时");
+                mesMap.put("inwardType", "内转计时");
                 break;
             case 12:
             case 13:

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

@@ -896,6 +896,10 @@
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>
+            <if test="con!=null">
+                and (instr(RCSE.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                 or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0)
+            </if>
         </where>
         )
         <where>

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

@@ -118,7 +118,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </delete>
@@ -317,7 +317,7 @@
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </select>