修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-ams-api</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>AMS_SALE_ORDER</param>
+                        <param>OMSTRUCK_ORDER</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -49,6 +49,7 @@ public class OyeWarehouseController extends BaseRESTfulController {
         rmsReceivePlace.setPlaceId(rmsReceivePlaceMapper.selectMaxId());
         rmsReceivePlace.setAddressId(new BigDecimal(3));
         rmsReceivePlace.setAddressDeliveryAddress(map.get("warehouseName").toString());
+        rmsReceivePlace.setInsertUpdateRemark(map.get("carrierName").toString());
         rmsReceivePlaceMapper.insertSelective(rmsReceivePlace);
         return success("新增成功");
     }
@@ -128,15 +129,20 @@ public class OyeWarehouseController extends BaseRESTfulController {
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> mapList = oyeWarehouseService.getTransPlan(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData5(apiId, null,mapList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,mapList);
         return success(pageList);
     }
 
     @ApiOperation("审核转运计划")
     @PostMapping("approveTransPlan")
     public RESTfulResult approveTransPlan(@RequestBody Map<String,Object> map) {
-        int i = oyeWarehouseService.approveTransPlan(map);
-        return success();
+        try {
+            String s = oyeWarehouseService.approveTransPlan(map);
+            return success(s);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage());
+        }
     }
 
 

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

@@ -58,4 +58,6 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
 
     BigDecimal getRealTimeMaterialNumber(BigDecimal inventoryId);
 
+    BigDecimal selectWarehouseId(BigDecimal saleMaterialId);
+
 }

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

@@ -76,7 +76,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private Date insertTime;
 
     /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,200)
      */
     @ApiModelProperty(value="记录修改人",required=false)
     private String updateUsername;
@@ -88,7 +88,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private Date updateTime;
 
     /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,200)
      */
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
@@ -100,9 +100,9 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal deleted;
 
     /**
-     * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）(ORDER_TYPE,DECIMAL,0)
+     * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单；19：零星退货；20：采购内转(专线-新区)；21：计时；23：采购内转；25:倒库 26:计次）(ORDER_TYPE,DECIMAL,0)
      */
-    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）",required=false)
+    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单；19：零星退货；20：采购内转(专线-新区)；21：计时；23：采购内转；25:倒库 26:计次）",required=false)
     private BigDecimal orderType;
 
     /**
@@ -177,6 +177,54 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="是否可作业",required=false)
     private BigDecimal canWork;
 
+    /**
+     * 打印次数(PRINTNUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="打印次数",required=false)
+    private BigDecimal printnumber;
+
+    /**
+     * 运力ids(CAPACITYIDS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="运力ids",required=false)
+    private String capacityids;
+
+    /**
+     * 异地库是否验收(IS_ACCEPT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="异地库是否验收",required=false)
+    private BigDecimal isAccept;
+
+    /**
+     * 记录下来的修改单价人(RECORD_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录下来的修改单价人",required=false)
+    private String recordUsername;
+
+    /**
+     * 打印时间(PRINTDATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="打印时间",required=false)
+    private Date printdate;
+
+    /**
+     * 订单备注(REMARK,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="订单备注",required=false)
+    private String remark;
+
+    /**
+     * 图片路径(URL,VARCHAR,700)
+     */
+    @ApiModelProperty(value="图片路径",required=false)
+    private String url;
+
+    /**
+     * 是否上传抵达签收(ARRIVAL_FLAG,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否上传抵达签收",required=false)
+    private BigDecimal arrivalFlag;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -413,6 +461,70 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         this.canWork = canWork;
     }
 
+    public BigDecimal getPrintnumber() {
+        return printnumber;
+    }
+
+    public void setPrintnumber(BigDecimal printnumber) {
+        this.printnumber = printnumber;
+    }
+
+    public String getCapacityids() {
+        return capacityids;
+    }
+
+    public void setCapacityids(String capacityids) {
+        this.capacityids = capacityids == null ? null : capacityids.trim();
+    }
+
+    public BigDecimal getIsAccept() {
+        return isAccept;
+    }
+
+    public void setIsAccept(BigDecimal isAccept) {
+        this.isAccept = isAccept;
+    }
+
+    public String getRecordUsername() {
+        return recordUsername;
+    }
+
+    public void setRecordUsername(String recordUsername) {
+        this.recordUsername = recordUsername == null ? null : recordUsername.trim();
+    }
+
+    public Date getPrintdate() {
+        return printdate;
+    }
+
+    public void setPrintdate(Date printdate) {
+        this.printdate = printdate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    public BigDecimal getArrivalFlag() {
+        return arrivalFlag;
+    }
+
+    public void setArrivalFlag(BigDecimal arrivalFlag) {
+        this.arrivalFlag = arrivalFlag;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -447,6 +559,14 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         sb.append(", driverTel=").append(driverTel);
         sb.append(", optionerCode=").append(optionerCode);
         sb.append(", canWork=").append(canWork);
+        sb.append(", printnumber=").append(printnumber);
+        sb.append(", capacityids=").append(capacityids);
+        sb.append(", isAccept=").append(isAccept);
+        sb.append(", recordUsername=").append(recordUsername);
+        sb.append(", printdate=").append(printdate);
+        sb.append(", remark=").append(remark);
+        sb.append(", url=").append(url);
+        sb.append(", arrivalFlag=").append(arrivalFlag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -1041,6 +1041,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }
             // 运输线路id
             BigDecimal lineId = DataChange.dataToBigDecimal(map.get("lineId"));
+            if(map.containsKey("oYeFlag")) {
+                lineId = null;
+            }
             BigDecimal isSteel = new BigDecimal(1);
             //try{
             //    //不为空且为新手机号，则修改电话号码
@@ -1134,6 +1137,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 omstruckOrder.setLineId(lineId);
                 omstruckOrder.setInsertTime(new Date());
                 omstruckOrder.setInsertUsername("");
+                if(map.containsKey("oYeFlag")) {
+                    omstruckOrder.setArrivalFlag(new BigDecimal(1));
+                }
                 //如果这个车序号下面有运单,则证明已经派了
                 Map<String,Object> orderMap1 = amsSaleOrderMapper.getSteelOrderMap(saleOrderMaterialId);
                 if (orderMap1 != null) {
@@ -1167,6 +1173,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 // 物资件数
                 omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
                 omstruckOrderMaterial.setSaleMaterialId(saleMaterialId);
+                if(map.containsKey("oYeFlag")) {
+                    //查询装货地点
+                    BigDecimal warehouseId = amsSaleMaterialMapper.selectWarehouseId(saleMaterialId);
+                    if (warehouseId != null) {
+                        omstruckOrderMaterial.setMaterialPriority(warehouseId);
+                    }
+                }
                 try {
                     BigDecimal deleted = (BigDecimal) materialMap.get("DELETED");
                     if(deleted != null) {

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

@@ -285,7 +285,7 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
             // 物资名称
             Object materialName = map.get("materialName");
             // 钢材米数
-            BigDecimal steelMeters = DataChange.dataToBigDecimal(map.get("steelMeters"));
+            BigDecimal steelMeters = DataChange.dataToBigDecimal(map.get("meterNumber"));
             // 判断物资是否是盘螺或盘元/盘圆
             if (materialName != null && (materialName.toString().contains("盘螺") || materialName.toString().contains("盘元") || materialName.toString().contains("盘圆"))) {
                 amsSaleMaterial.setSteelMeter(null);
@@ -350,13 +350,26 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
         return amsSaleOrderMapper.getTransPlan(mapValue);
     }
 
-    public int approveTransPlan(Map<String, Object> map) {
+    public String approveTransPlan(Map<String, Object> map) throws Exception {
         List<Map<String,Object>> mapList = (List<Map<String,Object>>) map.get("mapList");
+        int j = mapList.size();
         int i = 0 ;
         for (Map<String,Object> approveMap : mapList) {
-            i += amsSaleOrderMapper.approveTransPlan(approveMap);
+            if (DataChange.dataToBigDecimal(approveMap.get("orderStatus")).intValue() == 4) {
+                try {
+                    Boolean flag = getRealTimeInfo(approveMap);
+                    if(flag) {
+                        i += amsSaleOrderMapper.approveTransPlan(approveMap);
+                    }else{
+                        continue;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    continue;
+                }
+            }
         }
-        return i;
+        return "共提交" + j + "条" + "单据;成功" + i + "条";
     }
 
     //根据销售订单子表ID,判断待出库的一个数量

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -29,7 +29,7 @@ public class ColumnDataUtil {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
             //每个表头字段的过滤条件
-            if(columnData.get("isFilter") == null || DataChange.dataToBigDecimal(columnData.get("isFilter")).intValue() == 1) {
+            if(DataChange.dataToBigDecimal(columnData.get("isFilter")).intValue() == 1) {
                 columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
             }
         }

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

@@ -984,4 +984,14 @@
     SELECT NVL(SUM(ORI.MATERIAL_NUMBER),0) FROM OYE_REALTIME_INVENTORY ORI
     WHERE ORI.INVENTORY_ID = #{inventoryId}
   </select>
+  <select id="selectWarehouseId" resultType="java.math.BigDecimal">
+    SELECT RW.WAREHOUSE_ID FROM AMS_SALE_MATERIAL ASM
+    LEFT JOIN OYE_REALTIME_INVENTORY ORI
+    ON ORI.INVENTORY_ID = ASM.SALE_WAREHOUSE
+    LEFT JOIN RMS_WAREHOUSE RW
+    ON RW.WAREHOUSE_NAME = ORI.INBOUND_WAREHOUSE
+    WHERE RW.WAREHOUSE_TYPE_ID = 9
+    AND ASM.SALE_MATERIAL_ID = #{saleMaterialId}
+    FETCH NEXT 1 ROWS ONLY
+  </select>
 </mapper>

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

@@ -5091,6 +5091,7 @@
     ASOM.TRUCK_REMARK "trucRemark",
     ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
     ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
+    ORI.INVENTORY_ID "inventoryId",
     ORI.INBOUND_WAREHOUSE   "inventoryWarehouse",
     ORI.MATERIAL_NUMBER "inventoryMaterialNumber",
     ORI.THEORY_WEIGHT   "inventoryTheoryWeight",
@@ -5149,48 +5150,10 @@
           "saleNumber" like '%${item}%'
         </foreach>
       </if>
-      <if test="materialName != null">
+      <if test="inboundWarehouse != null">
         and
-        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
-          "materialName" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="specificationModel != null">
-        and
-        <foreach collection="specificationModel" item="item" open="(" separator="or" close=")">
-          "specificationModel" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="materialModel != null">
-        and
-        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
-          "materialModel" 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="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 collection="inboundWarehouse" item="item" open="(" separator="or" close=")">
+          "inboundWarehouse" like '%${item}%'
         </foreach>
       </if>
       <if test="materialTheoreticalWeight != null">

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

@@ -30,13 +30,22 @@
         <result column="DRIVER_TEL" jdbcType="VARCHAR" property="driverTel" />
         <result column="OPTIONER_CODE" jdbcType="VARCHAR" property="optionerCode" />
         <result column="CAN_WORK" jdbcType="DECIMAL" property="canWork" />
+        <result column="PRINTNUMBER" jdbcType="DECIMAL" property="printnumber" />
+        <result column="CAPACITYIDS" jdbcType="VARCHAR" property="capacityids" />
+        <result column="IS_ACCEPT" jdbcType="DECIMAL" property="isAccept" />
+        <result column="RECORD_USERNAME" jdbcType="VARCHAR" property="recordUsername" />
+        <result column="PRINTDATE" jdbcType="TIMESTAMP" property="printdate" />
+        <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+        <result column="URL" jdbcType="VARCHAR" property="url" />
+        <result column="ARRIVAL_FLAG" jdbcType="DECIMAL" property="arrivalFlag" />
     </resultMap>
     <sql id="columns">
         ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
     ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE,
     ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID, DRIVER_CONFIRMATION,
-    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE, CAN_WORK,
+    PRINTNUMBER, CAPACITYIDS, IS_ACCEPT, RECORD_USERNAME, PRINTDATE, REMARK, URL, ARRIVAL_FLAG
     </sql>
     <sql id="columns_alias">
         t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS,
@@ -44,7 +53,8 @@
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
     t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.UNLOAD_POINT_ID,
     t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID, t.TRIP_ID, t.ORDER_PRINT_STATUS,
-    t.DRIVER_TEL, t.OPTIONER_CODE, t.CAN_WORK
+    t.DRIVER_TEL, t.OPTIONER_CODE, t.CAN_WORK, t.PRINTNUMBER, t.CAPACITYIDS, t.IS_ACCEPT,
+    t.RECORD_USERNAME, t.PRINTDATE, t.REMARK, t.URL, t.ARRIVAL_FLAG
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
@@ -138,6 +148,30 @@
             <if test="canWork != null">
                 and CAN_WORK = #{canWork}
             </if>
+            <if test="printnumber != null">
+                and PRINTNUMBER = #{printnumber}
+            </if>
+            <if test="capacityids != null and capacityids != ''">
+                and CAPACITYIDS = #{capacityids}
+            </if>
+            <if test="isAccept != null">
+                and IS_ACCEPT = #{isAccept}
+            </if>
+            <if test="recordUsername != null and recordUsername != ''">
+                and RECORD_USERNAME = #{recordUsername}
+            </if>
+            <if test="printdate != null">
+                and TO_CHAR(PRINTDATE,'yyyy-MM-dd') = #{printdate}
+            </if>
+            <if test="remark != null and remark != ''">
+                and REMARK = #{remark}
+            </if>
+            <if test="url != null and url != ''">
+                and URL = #{url}
+            </if>
+            <if test="arrivalFlag != null">
+                and ARRIVAL_FLAG = #{arrivalFlag}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -226,9 +260,33 @@
             <if test="canWork != null">
                 and CAN_WORK = #{canWork}
             </if>
+            <if test="printnumber != null">
+                and PRINTNUMBER = #{printnumber}
+            </if>
+            <if test="capacityids != null and capacityids != ''">
+                and CAPACITYIDS LIKE '%${capacityids}%'
+            </if>
+            <if test="isAccept != null">
+                and IS_ACCEPT = #{isAccept}
+            </if>
+            <if test="recordUsername != null and recordUsername != ''">
+                and RECORD_USERNAME LIKE '%${recordUsername}%'
+            </if>
+            <if test="printdate != null">
+                and TO_CHAR(PRINTDATE,'yyyy-MM-dd') = #{printdate}
+            </if>
+            <if test="remark != null and remark != ''">
+                and REMARK LIKE '%${remark}%'
+            </if>
+            <if test="url != null and url != ''">
+                and URL LIKE '%${url}%'
+            </if>
+            <if test="arrivalFlag != null">
+                and ARRIVAL_FLAG = #{arrivalFlag}
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+    <delete id="deleteByPrimaryKey" parameterType="decimal">
         delete from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </delete>
@@ -316,6 +374,30 @@
         <if test="canWork != null">
             or CAN_WORK = #{canWork}
         </if>
+        <if test="printnumber != null">
+            or PRINTNUMBER = #{printnumber}
+        </if>
+        <if test="capacityids != null and capacityids != ''">
+            or CAPACITYIDS = #{capacityids}
+        </if>
+        <if test="isAccept != null">
+            or IS_ACCEPT = #{isAccept}
+        </if>
+        <if test="recordUsername != null and recordUsername != ''">
+            or RECORD_USERNAME = #{recordUsername}
+        </if>
+        <if test="printdate != null">
+            or TO_CHAR(PRINTDATE,'yyyy-MM-dd') = '#{printdate}'
+        </if>
+        <if test="remark != null and remark != ''">
+            or REMARK = #{remark}
+        </if>
+        <if test="url != null and url != ''">
+            or URL = #{url}
+        </if>
+        <if test="arrivalFlag != null">
+            or ARRIVAL_FLAG = #{arrivalFlag}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
@@ -327,7 +409,10 @@
                                     LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
                                     DRIVER_CONFIRMATION, PRICE_ID, CARRIER_ID,
                                     TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL,
-                                    OPTIONER_CODE, CAN_WORK)
+                                    OPTIONER_CODE, CAN_WORK, PRINTNUMBER,
+                                    CAPACITYIDS, IS_ACCEPT, RECORD_USERNAME,
+                                    PRINTDATE, REMARK, URL,
+                                    ARRIVAL_FLAG)
         values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
                 #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
                 #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
@@ -337,7 +422,10 @@
                 #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{unloadPointId,jdbcType=DECIMAL},
                 #{driverConfirmation,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
                 #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR},
-                #{optionerCode,jdbcType=VARCHAR}, #{canWork,jdbcType=DECIMAL})
+                #{optionerCode,jdbcType=VARCHAR}, #{canWork,jdbcType=DECIMAL}, #{printnumber,jdbcType=DECIMAL},
+                #{capacityids,jdbcType=VARCHAR}, #{isAccept,jdbcType=DECIMAL}, #{recordUsername,jdbcType=VARCHAR},
+                #{printdate,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR},
+                #{arrivalFlag,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER
@@ -426,6 +514,30 @@
             <if test="canWork != null">
                 CAN_WORK,
             </if>
+            <if test="printnumber != null">
+                PRINTNUMBER,
+            </if>
+            <if test="capacityids != null">
+                CAPACITYIDS,
+            </if>
+            <if test="isAccept != null">
+                IS_ACCEPT,
+            </if>
+            <if test="recordUsername != null">
+                RECORD_USERNAME,
+            </if>
+            <if test="printdate != null">
+                PRINTDATE,
+            </if>
+            <if test="remark != null">
+                REMARK,
+            </if>
+            <if test="url != null">
+                URL,
+            </if>
+            <if test="arrivalFlag != null">
+                ARRIVAL_FLAG,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -512,6 +624,30 @@
             <if test="canWork != null">
                 #{canWork,jdbcType=DECIMAL},
             </if>
+            <if test="printnumber != null">
+                #{printnumber,jdbcType=DECIMAL},
+            </if>
+            <if test="capacityids != null">
+                #{capacityids,jdbcType=VARCHAR},
+            </if>
+            <if test="isAccept != null">
+                #{isAccept,jdbcType=DECIMAL},
+            </if>
+            <if test="recordUsername != null">
+                #{recordUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="printdate != null">
+                #{printdate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="url != null">
+                #{url,jdbcType=VARCHAR},
+            </if>
+            <if test="arrivalFlag != null">
+                #{arrivalFlag,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -542,7 +678,15 @@
             ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
             DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
             OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
-            CAN_WORK = #{canWork,jdbcType=DECIMAL}
+            CAN_WORK = #{canWork,jdbcType=DECIMAL},
+            PRINTNUMBER = #{printnumber,jdbcType=DECIMAL},
+            CAPACITYIDS = #{capacityids,jdbcType=VARCHAR},
+            IS_ACCEPT = #{isAccept,jdbcType=DECIMAL},
+            RECORD_USERNAME = #{recordUsername,jdbcType=VARCHAR},
+            PRINTDATE = #{printdate,jdbcType=TIMESTAMP},
+            REMARK = #{remark,jdbcType=VARCHAR},
+            URL = #{url,jdbcType=VARCHAR},
+            ARRIVAL_FLAG = #{arrivalFlag,jdbcType=DECIMAL}
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -629,10 +773,34 @@
             <if test="canWork != null">
                 CAN_WORK = #{canWork,jdbcType=DECIMAL},
             </if>
+            <if test="printnumber != null">
+                PRINTNUMBER = #{printnumber,jdbcType=DECIMAL},
+            </if>
+            <if test="capacityids != null">
+                CAPACITYIDS = #{capacityids,jdbcType=VARCHAR},
+            </if>
+            <if test="isAccept != null">
+                IS_ACCEPT = #{isAccept,jdbcType=DECIMAL},
+            </if>
+            <if test="recordUsername != null">
+                RECORD_USERNAME = #{recordUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="printdate != null">
+                PRINTDATE = #{printdate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="remark != null">
+                REMARK = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="url != null">
+                URL = #{url,jdbcType=VARCHAR},
+            </if>
+            <if test="arrivalFlag != null">
+                ARRIVAL_FLAG = #{arrivalFlag,jdbcType=DECIMAL},
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="decimal" resultMap="BaseResultMap">
         <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
@@ -657,7 +825,10 @@
         LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
         DRIVER_CONFIRMATION, PRICE_ID,
         CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS,
-        DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+        DRIVER_TEL, OPTIONER_CODE, CAN_WORK,
+        PRINTNUMBER, CAPACITYIDS, IS_ACCEPT,
+        RECORD_USERNAME, PRINTDATE,
+        REMARK, URL, ARRIVAL_FLAG
         )
         ( <foreach collection="list" item="item" separator="union all">
         select
@@ -672,7 +843,10 @@
         #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.unloadPointId,jdbcType=DECIMAL},
         #{item.driverConfirmation,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
         #{item.carrierId,jdbcType=DECIMAL}, #{item.tripId,jdbcType=VARCHAR}, #{item.orderPrintStatus,jdbcType=DECIMAL},
-        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR}, #{item.canWork,jdbcType=DECIMAL}
+        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR}, #{item.canWork,jdbcType=DECIMAL},
+        #{item.printnumber,jdbcType=DECIMAL}, #{item.capacityids,jdbcType=VARCHAR}, #{item.isAccept,jdbcType=DECIMAL},
+        #{item.recordUsername,jdbcType=VARCHAR}, #{item.printdate,jdbcType=TIMESTAMP},
+        #{item.remark,jdbcType=VARCHAR}, #{item.url,jdbcType=VARCHAR}, #{item.arrivalFlag,jdbcType=DECIMAL}
         from dual
     </foreach> )
     </insert>
@@ -791,12 +965,43 @@
         <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.canWork,jdbcType=DECIMAL}
         </foreach>
+        ,PRINTNUMBER=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.printnumber,jdbcType=DECIMAL}
+        </foreach>
+        ,CAPACITYIDS=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.capacityids,jdbcType=VARCHAR}
+        </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>
+        ,RECORD_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.recordUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,PRINTDATE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.printdate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.remark,jdbcType=VARCHAR}
+        </foreach>
+        ,URL=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.url,jdbcType=VARCHAR}
+        </foreach>
+        ,ARRIVAL_FLAG=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.arrivalFlag,jdbcType=DECIMAL}
+        </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 OMSTRUCK_ORDER
         where ORDER_ID in