tijiao

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

@@ -233,8 +233,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         String userId = (String) map.get("userId");
         if (orgCode!=null){
            omstruckOrder.setOptionerCode(orgCode);
-        }else {
-            return null;
         }
         //生成订单主键Id
         BigDecimal maxId = omstruckOrderMapper.selectMaxId();
@@ -651,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);
@@ -685,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);

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

@@ -221,7 +221,11 @@
             </if>
         </where>
     </sql>
+<<<<<<< HEAD
     <delete id="deleteByPrimaryKey" parameterType="decimal">
+=======
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+>>>>>>> 5804cade49a708b938a0d46ae1d3d076d2c02aac
         delete from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </delete>
@@ -612,7 +616,7 @@
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
         <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
@@ -870,6 +874,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>