tijiao

pom.xml

@@ -128,13 +128,13 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>DAGANG</user>
-                    <password>root123</password>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <table>TMSTRUCK_UNLOAD_RESULT</table>-->
-                        <param>OMSTRAIN_ORDER</param>
+                        <param>OMSTRUCK_ORDER_MATERIAL</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -368,4 +368,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     //查询出订单的钢材长度
     List<Map<String,Object>> getMaterialId(BigDecimal orderId);
+
+
 }

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -40,7 +39,7 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     private BigDecimal orderMaterialWeight;
 
     /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     * 记录创建人(INSERT_USERNAME,VARCHAR,200)
      */
     @ApiModelProperty(value="记录创建人",required=false)
     private String insertUsername;
@@ -87,6 +86,12 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="物资委托发送状态:1:已发送",required=false)
     private BigDecimal materialMeassion;
 
+    /**
+     * 炉号(MATERIAL_LUNO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="炉号",required=false)
+    private String materialLuno;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -203,6 +208,14 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         this.materialMeassion = materialMeassion;
     }
 
+    public String getMaterialLuno() {
+        return materialLuno;
+    }
+
+    public void setMaterialLuno(String materialLuno) {
+        this.materialLuno = materialLuno == null ? null : materialLuno.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -222,6 +235,7 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(", materialDirection=").append(materialDirection);
         sb.append(", materialPriority=").append(materialPriority);
         sb.append(", materialMeassion=").append(materialMeassion);
+        sb.append(", materialLuno=").append(materialLuno);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -582,7 +582,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
-        if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4){
+        if((DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4)
+                && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
             throw new Exception("钢材订单不允许撤销!");
         }
         if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
@@ -600,7 +601,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("resultTotalId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
-        omstruckOrder.setOrderStatus(new BigDecimal(8));
+        omstruckOrder.setOrderStatus(new BigDecimal(7));
+        if(DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 1) {
+            omstruckOrder.setOrderStatus(new BigDecimal(4));
+        }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String dateStr = sdf.format(new Date());
         omstruckOrder.setInsertUpdateRemark(map.get("capacityNumber") + "司机撤销订单将订单删除," + "撤销时间:" + dateStr + "撤销时路段顺序号为:" + mesMap.get("lineSqe"));
@@ -2167,7 +2171,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 }
             }
             mesMap.put("materialMesList",materialMesNew);
-        }else {
+        } else {
             mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId, steelJudge));
         }
         return mesMap;

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

@@ -2920,7 +2920,12 @@
     <!-- 物资信息 -->
     <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
         SELECT
-        RM.MATERIAL_NAME
+        RM.MATERIAL_NAME || (
+            case
+                when OOM.MATERIAL_LUNO is not null
+                     then '-' || oom.MATERIAL_LUNO
+            end
+        )
         <if test="steelJudge != null">
             || '   ' || RW.WAREHOUSE_NAME
         </if>
@@ -2931,8 +2936,11 @@
         (case
         when OOM.ORDER_MATERIAL_NUMBER is not null
         then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+            case
         when OOM.ORDER_MATERIAL_WEIGHT is not null
-        then OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
         end
         )
         AS                                                                   "weightNum",
@@ -4277,4 +4285,35 @@
             AND OO.ORDER_STATUS in (2, 4, 5, 6)
         </if>
     </select>
+    <select id="getInwardMaterialMes" resultType="java.util.Map" parameterType="decimal">
+        SELECT
+        RM.MATERIAL_NAME
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+        case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
 </mapper>

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

@@ -15,16 +15,17 @@
     <result column="MATERIAL_DIRECTION" jdbcType="DECIMAL" property="materialDirection" />
     <result column="MATERIAL_PRIORITY" jdbcType="DECIMAL" property="materialPriority" />
     <result column="MATERIAL_MEASSION" jdbcType="DECIMAL" property="materialMeassion" />
+    <result column="MATERIAL_LUNO" jdbcType="VARCHAR" property="materialLuno" />
   </resultMap>
   <sql id="columns">
     ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
     INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    MATERIAL_DIRECTION, MATERIAL_PRIORITY, MATERIAL_MEASSION
+    MATERIAL_DIRECTION, MATERIAL_PRIORITY, MATERIAL_MEASSION, MATERIAL_LUNO
   </sql>
   <sql id="columns_alias">
     t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT, 
     t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY, t.MATERIAL_MEASSION
+    t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY, t.MATERIAL_MEASSION, t.MATERIAL_LUNO
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER_MATERIAL
@@ -73,6 +74,9 @@
       <if test="materialMeassion != null">
         and MATERIAL_MEASSION = #{materialMeassion}
       </if>
+      <if test="materialLuno != null and materialLuno != ''">
+        and MATERIAL_LUNO = #{materialLuno}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -116,6 +120,9 @@
       <if test="materialMeassion != null">
         and MATERIAL_MEASSION = #{materialMeassion}
       </if>
+      <if test="materialLuno != null and materialLuno != ''">
+        and MATERIAL_LUNO LIKE '%${materialLuno}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
@@ -161,18 +168,23 @@
     <if test="materialMeassion != null">
       or MATERIAL_MEASSION = #{materialMeassion}
     </if>
+    <if test="materialLuno != null and materialLuno != ''">
+      or MATERIAL_LUNO = #{materialLuno}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL (ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID,
                                          ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
                                          INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                          UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION,
-                                         MATERIAL_PRIORITY, MATERIAL_MEASSION)
+                                         MATERIAL_PRIORITY, MATERIAL_MEASSION, MATERIAL_LUNO
+    )
     values (#{orderMaterialId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
             #{orderMaterialNumber,jdbcType=DECIMAL}, #{orderMaterialWeight,jdbcType=DECIMAL},
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
             #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL},
-            #{materialPriority,jdbcType=DECIMAL}, #{materialMeassion,jdbcType=DECIMAL})
+            #{materialPriority,jdbcType=DECIMAL}, #{materialMeassion,jdbcType=DECIMAL}, #{materialLuno,jdbcType=VARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL
@@ -216,6 +228,9 @@
       <if test="materialMeassion != null">
         MATERIAL_MEASSION,
       </if>
+      <if test="materialLuno != null">
+        MATERIAL_LUNO,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderMaterialId != null">
@@ -257,6 +272,9 @@
       <if test="materialMeassion != null">
         #{materialMeassion,jdbcType=DECIMAL},
       </if>
+      <if test="materialLuno != null">
+        #{materialLuno,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -272,7 +290,8 @@
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
         MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
         MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL},
-        MATERIAL_MEASSION = #{materialMeassion,jdbcType=DECIMAL}
+        MATERIAL_MEASSION = #{materialMeassion,jdbcType=DECIMAL},
+        MATERIAL_LUNO = #{materialLuno,jdbcType=VARCHAR}
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -314,6 +333,9 @@
       <if test="materialMeassion != null">
         MATERIAL_MEASSION = #{materialMeassion,jdbcType=DECIMAL},
       </if>
+      <if test="materialLuno != null">
+        MATERIAL_LUNO = #{materialLuno,jdbcType=VARCHAR},
+      </if>
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
@@ -337,7 +359,8 @@
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     MATERIAL_DIRECTION, MATERIAL_PRIORITY,
-    MATERIAL_MEASSION)
+    MATERIAL_MEASSION, MATERIAL_LUNO
+    )
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.orderMaterialId,jdbcType=DECIMAL},
@@ -346,7 +369,8 @@
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
     #{item.materialDirection,jdbcType=DECIMAL}, #{item.materialPriority,jdbcType=DECIMAL},
-    #{item.materialMeassion,jdbcType=DECIMAL} from dual
+    #{item.materialMeassion,jdbcType=DECIMAL}, #{item.materialLuno,jdbcType=VARCHAR}
+    from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -404,12 +428,15 @@
     <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialMeassion,jdbcType=DECIMAL}
     </foreach>
+    ,MATERIAL_LUNO=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialLuno,jdbcType=VARCHAR}
+    </foreach>
     where ORDER_MATERIAL_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.orderMaterialId,jdbcType=DECIMAL}
     </foreach>
   </update>
-
   <delete id="batchDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID in
@@ -417,6 +444,10 @@
       #{id}
     </foreach>
   </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">