Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API

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

@@ -82,9 +82,9 @@ public class OmstrainOrder implements IBasePO<BigDecimal> {
     private BigDecimal billingWeight;
 
     /**
-     * 是否验收(IS_ACCEPT ,DECIMAL,0)
+     * 是否验收(0:未收货，1：已收货)(IS_ACCEPT ,DECIMAL,0)
      */
-    @ApiModelProperty(value="是否验收",required=false)
+    @ApiModelProperty(value="是否验收(0:未收货，1：已收货)",required=false)
     private BigDecimal isAccept;
 
     /**
@@ -105,6 +105,12 @@ public class OmstrainOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="验收时间",required=false)
     private Date isAcceptTime;
 
+    /**
+     * 验收备注(ACCEPT_REMARK,VARCHAR,200)
+     */
+    @ApiModelProperty(value="验收备注",required=false)
+    private String acceptRemark;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -245,6 +251,14 @@ public class OmstrainOrder implements IBasePO<BigDecimal> {
         this.isAcceptTime = isAcceptTime;
     }
 
+    public String getAcceptRemark() {
+        return acceptRemark;
+    }
+
+    public void setAcceptRemark(String acceptRemark) {
+        this.acceptRemark = acceptRemark == null ? null : acceptRemark.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -267,6 +281,7 @@ public class OmstrainOrder implements IBasePO<BigDecimal> {
         sb.append(", warehouseId=").append(warehouseId);
         sb.append(", strawmats=").append(strawmats);
         sb.append(", isAcceptTime=").append(isAcceptTime);
+        sb.append(", acceptRemark=").append(acceptRemark);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -323,7 +323,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     rmsMaterialMapper.updateByPrimaryKeySelective(rmsMaterial);
                     // 得到金蝶分录主键
                     String easPrimaryId = (String) materialMap.get("easPrimaryId");
-                    // 得到物资重量
+                    // 得到物资磅重
                     String materialWeight = (String) materialMap.get("materialNumber");
                     // 得到物资件数
                     String materialNumber = (String) materialMap.get("assistQty");
@@ -333,10 +333,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     amsSaleMaterial.setMaterialId(materialId);
                     amsSaleMaterial.setInsertTime(new Date());
                     amsSaleMaterial.setInsertUsername("金蝶");
-                    amsSaleMaterial.setMeterWeight(DataChange.dataToBigDecimal(meterWeight));
                     amsSaleMaterial.setInsertUpdateRemark("采集金蝶销售订单");
-                    if (materialWeight != null && !"".equals(materialWeight)) {
-                        amsSaleMaterial.setMaterialWeight(new BigDecimal(materialWeight));
+                    if (meterWeight != null && !"".equals(meterWeight)) {
+                        amsSaleMaterial.setMaterialWeight(DataChange.dataToBigDecimal(meterWeight));
                     }
                     if (materialNumber != null && !"".equals(materialNumber)) {
                         amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
@@ -563,7 +562,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleMaterial.setSaleOrderId(saleOrderId);
                 //  辅助数量
                 Object auxiliaryQuantity = materialMap.get("AuxiliaryQuantity");
-                // 数量
+                // 物资重量
                 Object meterWeight = materialMap.get("meterWeight");
 
                 Object steelMeter = materialMap.get("steelMeter");
@@ -619,7 +618,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 }
                 rmsMaterial.setMaterialCount(new BigDecimal(materialCount + 1));
                 rmsMaterialMapper.updateByPrimaryKeySelective(rmsMaterial);
-                // 得到物资数量
+                // 得到物资重量
                 String materialWeight = (String) materialMap.get("materialNumber");
                 // 得到计量单位
                 amsSaleMaterial.setEasPrimaryId(easPrimaryId);
@@ -665,120 +664,117 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 result += tmstrainPleaseApproveResultMapper.insertSelective(tmstrainPleaseApproveResult);
             }
         }else {
-            throw new Exception("暂不支持修改库存调拨单");
-//
-//            //此处判断主要是针对销售订单已经存在
-//            AmsSaleOrder amsSaleOrder=new AmsSaleOrder();
-//
-//            if (orderStatus.equals("2")){
-//                amsSaleOrder.setSaleOrderId(saleOrderNumber);
-//                amsSaleOrder.setCloseStatus(new BigDecimal(1));
-//                amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
-//            }
-//            //此处判断订单状态为反审核
-//            if (closeStatus.equals("0")) {
-//                amsSaleOrder.setSaleOrderId(saleOrderNumber);
-//                amsSaleOrder.setDeleted(new BigDecimal(1));
-//                result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
-//            }
-//            // 关闭单个分录订单
-//            if (closeStatus.equals("-1") && wholeOrder.equals("0")) {
-//                Object closeEntryId = map.get("closeEntryId");
-//                if (closeEntryId != null) {
-//                    Map<String, Object> easMap = new HashMap<>();
-//                    easMap.put("easPrimaryId", closeEntryId);
-//                    List<AmsSaleMaterial> amsSaleMaterials = amsSaleMaterialMapper.selectByParameters(easMap);
-//                    if (amsSaleMaterials != null && amsSaleMaterials.size() != 0) {
-//                        AmsSaleMaterial amsSaleMaterial = amsSaleMaterials.get(0);
-//                        amsSaleMaterial.setDeleted(new BigDecimal(0));
-//                        result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
-//                    }
-//                }
-//            }
-//            // 反关闭整单
-//            if (closeStatus.equals("-2") && "1".equals(wholeOrder)) {
-//                amsSaleOrder.setDeleted(new BigDecimal(0));
-//                Object reason = map.get("reason");
-//                BigDecimal saleOrderId = amsSaleOrder.getSaleOrderId();
-//                if (reason != null) {
-//                    amsSaleOrder.setInsertUpdateRemark(reason.toString());
-//                }
-//                // 反关闭销售订单下的所有分录
-//                result += amsSaleMaterialMapper.openAllSaleMaterial(saleOrderId);
-//                result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
-//            }
-//            // 反关闭单个分录订单
-//            if (closeStatus.equals("-2") && wholeOrder.equals("0")) {
-//                Object unCloseEntryId = map.get("unCloseEntryId");
-//                if (unCloseEntryId != null) {
-//                    Map<String, Object> easMap = new HashMap<>();
-//                    easMap.put("easPrimaryId", unCloseEntryId);
-//                    List<AmsSaleMaterial> amsSaleMaterials = amsSaleMaterialMapper.selectByParameters(easMap);
-//                    if (amsSaleMaterials != null && amsSaleMaterials.size() != 0) {
-//                        AmsSaleMaterial amsSaleMaterial = amsSaleMaterials.get(0);
-//                        result += amsSaleMaterialMapper.unCloseSaleMaterial(amsSaleMaterial.getSaleMaterialId());
-//                    }
-//                }
-//            }
-//            //编辑销售订单主键
-//            amsSaleOrder.setSaleOrderId(saleOrderNumber);
-//            //新增单据编码
-//            amsSaleOrder.setSaleNumber(saleNumber);
-//            // 订单日期
-//            try {
-//                Date saleOrderBizDate = sdf.parse(saleOrderBizDateStr);
-//                amsSaleOrder.setInsertTime(saleOrderBizDate);
-//            } catch (ParseException e) {
-//                e.printStackTrace();
-//            }
-//            //业务日期
-//            try {
-//                Date BusinessDate = sdf2.parse(businessDate);
-//                amsSaleOrder.setBusinessDate(BusinessDate);
-//            } catch (ParseException e) {
-//                e.printStackTrace();
-//            }
-//            amsSaleOrder.setWhetherTheCar(whetherTheCar);
-//            amsSaleOrder.setSaleRemark(saleRemark);
-//            amsSaleOrder.setSaleOrderStatus(new BigDecimal(2));
-//            //销售订单类型：内转钢材到异地库
-//            amsSaleOrder.setSaleType(new BigDecimal(4));
-//            amsSaleOrder.setTransferInDep(transferInDep);
-//            amsSaleOrder.setTransferOutDep(transferOutDep);
-//            amsSaleOrder.setDeleted(new BigDecimal(0));
-//            amsSaleOrder.setTransferInInventoryOrg(transferInInventoryOrg);
-//            amsSaleOrder.setTransferOutInventoryOrg(transferOutInventoryOrg);
-//            amsSaleOrder.setBusinessType(businessType);
-//            result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
-//            Object toTheStation = map.get("toTheStation");
-//            //根据销售订单id查找是否存在该请车实绩
-//            BigDecimal resultId = tmstrainPleaseApproveResultMapper.selectResultId(saleOrderNumber);
-//            TmstrainPleaseApproveResult tmstrainPleaseApproveResult=new TmstrainPleaseApproveResult();
-//            tmstrainPleaseApproveResult.setResultId(resultId);
-//            tmstrainPleaseApproveResult.setRailPlanId(saleOrderNumber);
-//            //查找到站是否存在到站表
-//            BigDecimal sendStation = rmstrainArrivalSendMapper.getSendStation((String) toTheStation);
-//            //到站不存在
-//            if (sendStation==null){
-//                //新增到站
-//                BigDecimal toStationMaxId = rmstrainArrivalSendMapper.getMaxId();
-//                RmstrainArrivalSend rmstrainArrivalSend=new RmstrainArrivalSend();
-//                rmstrainArrivalSend.setArrivalId(toStationMaxId);
-//                rmstrainArrivalSend.setArrivalName((String) toTheStation);
-//                rmstrainArrivalSend.setInsertTime(new Date());
-//                rmstrainArrivalSend.setInsertUsername("金蝶");
-//                rmstrainArrivalSend.setInsertUpdateRemark("金蝶回传数据");
-//                result += rmstrainArrivalSendMapper.insertSelective(rmstrainArrivalSend);
-//            }else {
-//                //到站存在
-//                tmstrainPleaseApproveResult.setToTheStationId(sendStation);
-//            }
-//            tmstrainPleaseApproveResult.setResultType(new BigDecimal(4));
-//            tmstrainPleaseApproveResult.setInsertTime(new Date());
-//            tmstrainPleaseApproveResult.setInsertUpdateRemark("金蝶回传");
-//            result += tmstrainPleaseApproveResultMapper.updateByPrimaryKeySelective(tmstrainPleaseApproveResult);
-//            //修改销售订单子表
-//
+//            throw new Exception("暂不支持修改库存调拨单");
+            //此处判断主要是针对销售订单已经存在
+            AmsSaleOrder amsSaleOrder=new AmsSaleOrder();
+            if (orderStatus.equals("2")){
+                amsSaleOrder.setSaleOrderId(saleOrderNumber);
+                amsSaleOrder.setCloseStatus(new BigDecimal(1));
+                amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+            }
+            //此处判断订单状态为反审核
+            if (closeStatus.equals("5")) {
+                amsSaleOrder.setSaleOrderId(saleOrderNumber);
+                amsSaleOrder.setDeleted(new BigDecimal(1));
+                result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+            }
+            // 关闭单个分录订单
+            if (closeStatus.equals("-1") && wholeOrder.equals("0")) {
+                Object closeEntryId = map.get("closeEntryId");
+                if (closeEntryId != null) {
+                    Map<String, Object> easMap = new HashMap<>();
+                    easMap.put("easPrimaryId", closeEntryId);
+                    List<AmsSaleMaterial> amsSaleMaterials = amsSaleMaterialMapper.selectByParameters(easMap);
+                    if (amsSaleMaterials != null && amsSaleMaterials.size() != 0) {
+                        AmsSaleMaterial amsSaleMaterial = amsSaleMaterials.get(0);
+                        amsSaleMaterial.setDeleted(new BigDecimal(0));
+                        result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
+                    }
+                }
+            }
+            // 反关闭整单
+            if (closeStatus.equals("-2") && "1".equals(wholeOrder)) {
+                amsSaleOrder.setDeleted(new BigDecimal(0));
+                Object reason = map.get("reason");
+                BigDecimal saleOrderId = amsSaleOrder.getSaleOrderId();
+                if (reason != null) {
+                    amsSaleOrder.setInsertUpdateRemark(reason.toString());
+                }
+                // 反关闭销售订单下的所有分录
+                result += amsSaleMaterialMapper.openAllSaleMaterial(saleOrderId);
+                result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+            }
+            // 反关闭单个分录订单
+            if (closeStatus.equals("-2") && wholeOrder.equals("0")) {
+                Object unCloseEntryId = map.get("unCloseEntryId");
+                if (unCloseEntryId != null) {
+                    Map<String, Object> easMap = new HashMap<>();
+                    easMap.put("easPrimaryId", unCloseEntryId);
+                    List<AmsSaleMaterial> amsSaleMaterials = amsSaleMaterialMapper.selectByParameters(easMap);
+                    if (amsSaleMaterials != null && amsSaleMaterials.size() != 0) {
+                        AmsSaleMaterial amsSaleMaterial = amsSaleMaterials.get(0);
+                        result += amsSaleMaterialMapper.unCloseSaleMaterial(amsSaleMaterial.getSaleMaterialId());
+                    }
+                }
+            }
+            //编辑销售订单主键
+            amsSaleOrder.setSaleOrderId(saleOrderNumber);
+            //新增单据编码
+            amsSaleOrder.setSaleNumber(saleNumber);
+            // 订单日期
+            try {
+                Date saleOrderBizDate = sdf.parse(saleOrderBizDateStr);
+                amsSaleOrder.setInsertTime(saleOrderBizDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            //业务日期
+            try {
+                Date BusinessDate = sdf2.parse(businessDate);
+                amsSaleOrder.setBusinessDate(BusinessDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            amsSaleOrder.setWhetherTheCar(whetherTheCar);
+            amsSaleOrder.setSaleRemark(saleRemark);
+            amsSaleOrder.setSaleOrderStatus(new BigDecimal(2));
+            //销售订单类型：内转钢材到异地库
+            amsSaleOrder.setSaleType(new BigDecimal(4));
+            amsSaleOrder.setTransferInDep(transferInDep);
+            amsSaleOrder.setTransferOutDep(transferOutDep);
+            amsSaleOrder.setDeleted(new BigDecimal(0));
+            amsSaleOrder.setTransferInInventoryOrg(transferInInventoryOrg);
+            amsSaleOrder.setTransferOutInventoryOrg(transferOutInventoryOrg);
+            amsSaleOrder.setBusinessType(businessType);
+            result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+            Object toTheStation = map.get("toTheStation");
+            //根据销售订单id查找是否存在该请车实绩
+            BigDecimal resultId = tmstrainPleaseApproveResultMapper.selectResultId(saleOrderNumber);
+            TmstrainPleaseApproveResult tmstrainPleaseApproveResult=new TmstrainPleaseApproveResult();
+            tmstrainPleaseApproveResult.setResultId(resultId);
+            tmstrainPleaseApproveResult.setRailPlanId(saleOrderNumber);
+            //查找到站是否存在到站表
+            BigDecimal sendStation = rmstrainArrivalSendMapper.getSendStation((String) toTheStation);
+            //到站不存在
+            if (sendStation==null){
+                //新增到站
+                BigDecimal toStationMaxId = rmstrainArrivalSendMapper.getMaxId();
+                RmstrainArrivalSend rmstrainArrivalSend=new RmstrainArrivalSend();
+                rmstrainArrivalSend.setArrivalId(toStationMaxId);
+                rmstrainArrivalSend.setArrivalName((String) toTheStation);
+                rmstrainArrivalSend.setInsertTime(new Date());
+                rmstrainArrivalSend.setInsertUsername("金蝶");
+                rmstrainArrivalSend.setInsertUpdateRemark("金蝶回传数据");
+                result += rmstrainArrivalSendMapper.insertSelective(rmstrainArrivalSend);
+            }else {
+                //到站存在
+                tmstrainPleaseApproveResult.setToTheStationId(sendStation);
+            }
+            tmstrainPleaseApproveResult.setResultType(new BigDecimal(4));
+            tmstrainPleaseApproveResult.setInsertTime(new Date());
+            tmstrainPleaseApproveResult.setInsertUpdateRemark("金蝶回传");
+            result += tmstrainPleaseApproveResultMapper.updateByPrimaryKeySelective(tmstrainPleaseApproveResult);
+            //修改销售订单子表
         }
         return result;
     }
@@ -817,6 +813,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         OmstrainOrder omstrainOrder = new OmstrainOrder();
         //获取运输订单号
         Object orderNumber = map.get("orderNumber");
+        //获取备注-如果是异常情况，填写备注。
+        Object remark = map.get("remark");
+        if (remark!=null){
+            omstrainOrder.setAcceptRemark((String) remark);
+        }
         //接收车皮号
         Object wagonNo = map.get("wagonNo");
         BigDecimal orderId = omstrainOrderMapper.selectOrderIdBywagonNoAndOrderNumber((String) orderNumber, (String) wagonNo);

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

@@ -18,17 +18,18 @@
     <result column="WAREHOUSE_ID" jdbcType="DECIMAL" property="warehouseId" />
     <result column="STRAWMATS" jdbcType="DECIMAL" property="strawmats" />
     <result column="IS_ACCEPT_TIME" jdbcType="TIMESTAMP" property="isAcceptTime" />
+    <result column="ACCEPT_REMARK" jdbcType="VARCHAR" property="acceptRemark" />
   </resultMap>
   <sql id="columns">
-    ORDER_ID, ORDER_NO, ORDER_WAGON_NO, ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME, 
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, ENSTATION_TIME, OUTSTATION_TIME, 
-    BILLING_WEIGHT, IS_ACCEPT, WAREHOUSE_ID, STRAWMATS, IS_ACCEPT_TIME
+    ORDER_ID, ORDER_NO, ORDER_WAGON_NO, ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, ENSTATION_TIME, OUTSTATION_TIME,
+    BILLING_WEIGHT, "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS, IS_ACCEPT_TIME, ACCEPT_REMARK
   </sql>
   <sql id="columns_alias">
-    t.ORDER_ID, t.ORDER_NO, t.ORDER_WAGON_NO, t.ORDER_WAGON_WEIGHT, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.ENSTATION_TIME, 
-    t.OUTSTATION_TIME, t.BILLING_WEIGHT, t.IS_ACCEPT, t.WAREHOUSE_ID, t.STRAWMATS,
-    t.IS_ACCEPT_TIME
+    t.ORDER_ID, t.ORDER_NO, t.ORDER_WAGON_NO, t.ORDER_WAGON_WEIGHT, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.ENSTATION_TIME,
+    t.OUTSTATION_TIME, t.BILLING_WEIGHT, t."IS_ACCEPT ", t.WAREHOUSE_ID, t.STRAWMATS,
+    t.IS_ACCEPT_TIME, t.ACCEPT_REMARK
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM OMSTRAIN_ORDER
@@ -37,7 +38,7 @@
     SELECT <include refid="columns_alias" /> FROM OMSTRAIN_ORDER t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="orderId != null">
         and ORDER_ID = #{orderId}
       </if>
@@ -86,10 +87,13 @@
       <if test="isAcceptTime != null">
         and TO_CHAR(IS_ACCEPT_TIME,'yyyy-MM-dd') = #{isAcceptTime}
       </if>
+      <if test="acceptRemark != null and acceptRemark != ''">
+        and ACCEPT_REMARK = #{acceptRemark}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="orderId != null">
         and ORDER_ID = #{orderId}
       </if>
@@ -127,7 +131,7 @@
         and BILLING_WEIGHT = #{billingWeight}
       </if>
       <if test="isAccept != null">
-        and IS_ACCEPT = #{isAccept}
+        and IS_ACCEPT  = #{isAccept}
       </if>
       <if test="warehouseId != null">
         and WAREHOUSE_ID = #{warehouseId}
@@ -138,6 +142,9 @@
       <if test="isAcceptTime != null">
         and TO_CHAR(IS_ACCEPT_TIME,'yyyy-MM-dd') = #{isAcceptTime}
       </if>
+      <if test="acceptRemark != null and acceptRemark != ''">
+        and ACCEPT_REMARK LIKE '%${acceptRemark}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -146,66 +153,69 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from OMSTRAIN_ORDER
-    where 1!=1 
-      <if test="orderNo != null and orderNo != ''">
-        or ORDER_NO = #{orderNo}
-      </if>
-      <if test="orderWagonNo != null and orderWagonNo != ''">
-        or ORDER_WAGON_NO = #{orderWagonNo}
-      </if>
-      <if test="orderWagonWeight != null">
-        or ORDER_WAGON_WEIGHT = #{orderWagonWeight}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="enstationTime != null">
-        or TO_CHAR(ENSTATION_TIME,'yyyy-MM-dd') = '#{enstationTime}'
-      </if>
-      <if test="outstationTime != null">
-        or TO_CHAR(OUTSTATION_TIME,'yyyy-MM-dd') = '#{outstationTime}'
-      </if>
-      <if test="billingWeight != null">
-        or BILLING_WEIGHT = #{billingWeight}
-      </if>
-      <if test="isAccept != null">
-        or IS_ACCEPT  = #{isAccept}
-      </if>
-      <if test="warehouseId != null">
-        or WAREHOUSE_ID = #{warehouseId}
-      </if>
-      <if test="strawmats != null">
-        or STRAWMATS = #{strawmats}
-      </if>
-      <if test="isAcceptTime != null">
-        or TO_CHAR(IS_ACCEPT_TIME,'yyyy-MM-dd') = '#{isAcceptTime}'
-      </if>
+    where 1!=1
+    <if test="orderNo != null and orderNo != ''">
+      or ORDER_NO = #{orderNo}
+    </if>
+    <if test="orderWagonNo != null and orderWagonNo != ''">
+      or ORDER_WAGON_NO = #{orderWagonNo}
+    </if>
+    <if test="orderWagonWeight != null">
+      or ORDER_WAGON_WEIGHT = #{orderWagonWeight}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="enstationTime != null">
+      or TO_CHAR(ENSTATION_TIME,'yyyy-MM-dd') = '#{enstationTime}'
+    </if>
+    <if test="outstationTime != null">
+      or TO_CHAR(OUTSTATION_TIME,'yyyy-MM-dd') = '#{outstationTime}'
+    </if>
+    <if test="billingWeight != null">
+      or BILLING_WEIGHT = #{billingWeight}
+    </if>
+    <if test="isAccept != null">
+      or IS_ACCEPT  = #{isAccept}
+    </if>
+    <if test="warehouseId != null">
+      or WAREHOUSE_ID = #{warehouseId}
+    </if>
+    <if test="strawmats != null">
+      or STRAWMATS = #{strawmats}
+    </if>
+    <if test="isAcceptTime != null">
+      or TO_CHAR(IS_ACCEPT_TIME,'yyyy-MM-dd') = '#{isAcceptTime}'
+    </if>
+    <if test="acceptRemark != null and acceptRemark != ''">
+      or ACCEPT_REMARK = #{acceptRemark}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.OmstrainOrder">
-    insert into OMSTRAIN_ORDER (ORDER_ID, ORDER_NO, ORDER_WAGON_NO, 
-      ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      ENSTATION_TIME, OUTSTATION_TIME, BILLING_WEIGHT, 
-      IS_ACCEPT, WAREHOUSE_ID, STRAWMATS,
-      IS_ACCEPT_TIME)
-    values (#{orderId,jdbcType=DECIMAL}, #{orderNo,jdbcType=VARCHAR}, #{orderWagonNo,jdbcType=VARCHAR}, 
-      #{orderWagonWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
-      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{enstationTime,jdbcType=TIMESTAMP}, #{outstationTime,jdbcType=TIMESTAMP}, #{billingWeight,jdbcType=DECIMAL}, 
-      #{isAccept,jdbcType=DECIMAL}, #{warehouseId,jdbcType=DECIMAL}, #{strawmats,jdbcType=DECIMAL}, 
-      #{isAcceptTime,jdbcType=TIMESTAMP})
+    insert into OMSTRAIN_ORDER (ORDER_ID, ORDER_NO, ORDER_WAGON_NO,
+                                ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME,
+                                UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                ENSTATION_TIME, OUTSTATION_TIME, BILLING_WEIGHT,
+                                "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS,
+                                IS_ACCEPT_TIME, ACCEPT_REMARK)
+    values (#{orderId,jdbcType=DECIMAL}, #{orderNo,jdbcType=VARCHAR}, #{orderWagonNo,jdbcType=VARCHAR},
+            #{orderWagonWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+            #{enstationTime,jdbcType=TIMESTAMP}, #{outstationTime,jdbcType=TIMESTAMP}, #{billingWeight,jdbcType=DECIMAL},
+            #{isAccept,jdbcType=DECIMAL}, #{warehouseId,jdbcType=DECIMAL}, #{strawmats,jdbcType=DECIMAL},
+            #{isAcceptTime,jdbcType=TIMESTAMP}, #{acceptRemark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstrainOrder">
     insert into OMSTRAIN_ORDER
@@ -258,6 +268,9 @@
       <if test="isAcceptTime != null">
         IS_ACCEPT_TIME,
       </if>
+      <if test="acceptRemark != null">
+        ACCEPT_REMARK,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderId != null">
@@ -308,25 +321,29 @@
       <if test="isAcceptTime != null">
         #{isAcceptTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="acceptRemark != null">
+        #{acceptRemark,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstrainOrder">
     update OMSTRAIN_ORDER
     set ORDER_NO = #{orderNo,jdbcType=VARCHAR},
-      ORDER_WAGON_NO = #{orderWagonNo,jdbcType=VARCHAR},
-      ORDER_WAGON_WEIGHT = #{orderWagonWeight,jdbcType=DECIMAL},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      ENSTATION_TIME = #{enstationTime,jdbcType=TIMESTAMP},
-      OUTSTATION_TIME = #{outstationTime,jdbcType=TIMESTAMP},
-      BILLING_WEIGHT = #{billingWeight,jdbcType=DECIMAL},
-      IS_ACCEPT = #{isAccept,jdbcType=DECIMAL},
-      WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
-      STRAWMATS = #{strawmats,jdbcType=DECIMAL},
-      IS_ACCEPT_TIME = #{isAcceptTime,jdbcType=TIMESTAMP}
+        ORDER_WAGON_NO = #{orderWagonNo,jdbcType=VARCHAR},
+        ORDER_WAGON_WEIGHT = #{orderWagonWeight,jdbcType=DECIMAL},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        ENSTATION_TIME = #{enstationTime,jdbcType=TIMESTAMP},
+        OUTSTATION_TIME = #{outstationTime,jdbcType=TIMESTAMP},
+        BILLING_WEIGHT = #{billingWeight,jdbcType=DECIMAL},
+        "IS_ACCEPT " = #{isAccept,jdbcType=DECIMAL},
+        WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
+        STRAWMATS = #{strawmats,jdbcType=DECIMAL},
+        IS_ACCEPT_TIME = #{isAcceptTime,jdbcType=TIMESTAMP},
+        ACCEPT_REMARK = #{acceptRemark,jdbcType=VARCHAR}
     where ORDER_ID = #{orderId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstrainOrder">
@@ -377,6 +394,9 @@
       <if test="isAcceptTime != null">
         IS_ACCEPT_TIME = #{isAcceptTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="acceptRemark != null">
+        ACCEPT_REMARK = #{acceptRemark,jdbcType=VARCHAR},
+      </if>
     </set>
     where ORDER_ID = #{orderId,jdbcType=DECIMAL}
   </update>
@@ -392,104 +412,107 @@
     <include refid="select" />
     <include refid="whereLike" />
   </select>
-
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into OMSTRAIN_ORDER 
-      (ORDER_ID, 
-      ORDER_NO, ORDER_WAGON_NO, ORDER_WAGON_WEIGHT, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, ENSTATION_TIME, 
-      OUTSTATION_TIME, BILLING_WEIGHT, 
-      IS_ACCEPT, WAREHOUSE_ID, STRAWMATS,
-      IS_ACCEPT_TIME)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.orderId,jdbcType=DECIMAL}, 
-      #{item.orderNo,jdbcType=VARCHAR}, #{item.orderWagonNo,jdbcType=VARCHAR}, #{item.orderWagonWeight,jdbcType=DECIMAL}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.enstationTime,jdbcType=TIMESTAMP}, 
-      #{item.outstationTime,jdbcType=TIMESTAMP}, #{item.billingWeight,jdbcType=DECIMAL}, 
-      #{item.isAccept,jdbcType=DECIMAL}, #{item.warehouseId,jdbcType=DECIMAL}, #{item.strawmats,jdbcType=DECIMAL}, 
-      #{item.isAcceptTime,jdbcType=TIMESTAMP} from dual  
-   </foreach> )
+    insert into OMSTRAIN_ORDER
+    (ORDER_ID,
+    ORDER_NO, ORDER_WAGON_NO, ORDER_WAGON_WEIGHT,
+    INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, ENSTATION_TIME,
+    OUTSTATION_TIME, BILLING_WEIGHT,
+    "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS,
+    IS_ACCEPT_TIME, ACCEPT_REMARK)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.orderId,jdbcType=DECIMAL},
+    #{item.orderNo,jdbcType=VARCHAR}, #{item.orderWagonNo,jdbcType=VARCHAR}, #{item.orderWagonWeight,jdbcType=DECIMAL},
+    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.enstationTime,jdbcType=TIMESTAMP},
+    #{item.outstationTime,jdbcType=TIMESTAMP}, #{item.billingWeight,jdbcType=DECIMAL},
+    #{item.isAccept,jdbcType=DECIMAL}, #{item.warehouseId,jdbcType=DECIMAL}, #{item.strawmats,jdbcType=DECIMAL},
+    #{item.isAcceptTime,jdbcType=TIMESTAMP}, #{item.acceptRemark,jdbcType=VARCHAR} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update OMSTRAIN_ORDER
-     set
-       ORDER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
-       </foreach>
-       ,ORDER_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.orderNo,jdbcType=VARCHAR}
-       </foreach>
-       ,ORDER_WAGON_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.orderWagonNo,jdbcType=VARCHAR}
-       </foreach>
-       ,ORDER_WAGON_WEIGHT=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.orderWagonWeight,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,ENSTATION_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.enstationTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,OUTSTATION_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.outstationTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,BILLING_WEIGHT=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.billingWeight,jdbcType=DECIMAL}
-       </foreach>
-       ,"IS_ACCEPT "=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.isAccept,jdbcType=DECIMAL}
-       </foreach>
-       ,WAREHOUSE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.warehouseId,jdbcType=DECIMAL}
-       </foreach>
-       ,STRAWMATS=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.strawmats,jdbcType=DECIMAL}
-       </foreach>
-       ,IS_ACCEPT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-          when #{item.orderId,jdbcType=DECIMAL} then #{item.isAcceptTime,jdbcType=TIMESTAMP}
-       </foreach>
-     where ORDER_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.orderId,jdbcType=DECIMAL}
-     </foreach> 
+    update OMSTRAIN_ORDER
+    set
+    ORDER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
+    </foreach>
+    ,ORDER_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.orderNo,jdbcType=VARCHAR}
+    </foreach>
+    ,ORDER_WAGON_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.orderWagonNo,jdbcType=VARCHAR}
+    </foreach>
+    ,ORDER_WAGON_WEIGHT=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.orderWagonWeight,jdbcType=DECIMAL}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,ENSTATION_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.enstationTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,OUTSTATION_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.outstationTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,BILLING_WEIGHT=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.billingWeight,jdbcType=DECIMAL}
+    </foreach>
+    ,"IS_ACCEPT "=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.isAccept,jdbcType=DECIMAL}
+    </foreach>
+    ,WAREHOUSE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.warehouseId,jdbcType=DECIMAL}
+    </foreach>
+    ,STRAWMATS=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.strawmats,jdbcType=DECIMAL}
+    </foreach>
+    ,IS_ACCEPT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.isAcceptTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,ACCEPT_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+      when #{item.orderId,jdbcType=DECIMAL} then #{item.acceptRemark,jdbcType=VARCHAR}
+    </foreach>
+    where ORDER_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.orderId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from OMSTRAIN_ORDER
-    where ORDER_ID in 
+    where ORDER_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -501,7 +524,7 @@
     from OMSTRAIN_ORDER oo
     where oo.ORDER_NO =#{orderNumber}
   </select>
-<!--  根据车皮号和运输订单号查找运输订单id-->
+  <!--  根据车皮号和运输订单号查找运输订单id-->
   <select id="selectOrderIdBywagonNoAndOrderNumber" resultType="java.math.BigDecimal" parameterType="java.util.Map">
     select oo.ORDER_ID "orderId"
     from OMSTRAIN_ORDER oo