tijiaio

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

@@ -175,8 +175,6 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementNumber(DataChange.generateEightDigitsNumber("YSXQ",amstruckInwardRequirementMapper.selectOtherId().intValue()));
         amstruckInwardRequirement.setRequirementStatus(new BigDecimal(2));
         amstruckInwardRequirement.setRequirementType(requirementType);
-        //设置截止日期为2099年
-        amstruckInwardRequirement.setDueDate(new Date(4095805350000L));
         //用车单位
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));
         //判断截止日期是否为空

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

@@ -456,4 +456,26 @@
     AND RM.MATERIAL_SPECIFICATION = #{type}
     AND RM.MATERIAL_MODEL = #{model}
   </select>
+     <select id="getRequirementMaterial" resultType="java.util.Map" >
+        select rw1.warehouse_name "unloadName",
+                            rw1.WAREHOUSE_ID "unloadId",
+                          rw2.warehouse_name "loadName",
+                            rw2.WAREHOUSE_ID "loadId",
+                          arm.material_weight "materialWeight",
+                             arm.material_count "materialCount",
+                             arm.MATERIAL_ID "materialId",
+                             rm.material_name || rm.material_specification || '(' ||
+                             rm.material_model || ')' "materialName",
+                             arm.load_unload_sequence "loadSequence"
+                 from amstruck_requirement_material arm
+                        left join rms_warehouse rw1
+                      on rw1.warehouse_id = arm.requirement_unload_unit_id
+                        left join rms_warehouse rw2
+                                  on rw2.warehouse_id = arm.requirement_platform_id
+                        left join rms_material rm
+                                 on rm.material_id = arm.material_id
+                        left join amstruck_inward_requirement air
+                                  on air.requirement_id = arm.requirement_id
+                 where air.requirement_id = #{requirementId}
+               </select>
 </mapper>