修改订单

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

@@ -650,9 +650,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 +681,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

@@ -870,6 +870,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>