pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改出库申请页面

lwx_dev
erdanergou 3 years ago
parent
12337399b5
commit
91158c16d5
18 changed files with 463 additions and 410 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 69
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 12
      src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java
  4. 9
      src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java
  5. 52
      src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  6. 25
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java
  7. 18
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java
  8. 3
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  9. 7
      src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
  10. 8
      src/main/resources/templates/pages/application/form-step-look_back.html
  11. 9
      src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
  12. 261
      src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
  13. 2
      src/main/resources/templates/pages/user/login.html
  14. 52
      target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  15. 8
      target/classes/templates/pages/application/form-step-look_back.html
  16. 9
      target/classes/templates/pages/application/form-step-look_minRecordOut.html
  17. 261
      target/classes/templates/pages/applicationForStorageCenter/application-out.html
  18. 2
      target/classes/templates/pages/user/login.html

54
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
View File

@ -464,14 +464,7 @@ public class DepositoryRecordController {
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
List<Integer> params = (List<Integer>) map.get("params"); List<Integer> params = (List<Integer>) map.get("params");
Integer integer = 0; Integer integer = 0;
if (params.size() < 1 && map.size() > 3) {
Integer res = depositoryRecordService.insertApplicationOutRecord(map, userToken); // 插入主订单
Object id = map.get("id"); // 获取主订单编号
if (res == 1) { // 如果插入成功
if (id != null) {
map.remove("id");
map.put("parentId", id);
}
if (map.containsKey("constructionUnitId")) { if (map.containsKey("constructionUnitId")) {
String constructionUnitId = map.get("constructionUnitId").toString(); String constructionUnitId = map.get("constructionUnitId").toString();
if ("".equals(constructionUnitId)) { if ("".equals(constructionUnitId)) {
@ -486,7 +479,14 @@ public class DepositoryRecordController {
} else { } else {
map.put("adminorgId", userToken.getMaindeparment()); map.put("adminorgId", userToken.getMaindeparment());
} }
if (params.size() < 1 && map.size() > 3) {
Integer res = depositoryRecordService.insertApplicationOutRecord(map, userToken); // 插入主订单
Object id = map.get("id"); // 获取主订单编号
if (res == 1) { // 如果插入成功
if (id != null) {
map.remove("id");
map.put("parentId", id);
}
integer += depositoryRecordService.insertApplicationOutMin(map); integer += depositoryRecordService.insertApplicationOutMin(map);
// 开启一个线程执行发送信息操作 // 开启一个线程执行发送信息操作
@ -548,47 +548,16 @@ public class DepositoryRecordController {
insert.put("applicantId", userToken.getId()); insert.put("applicantId", userToken.getId());
insert.put("mid", map.get("mid" + temp)); insert.put("mid", map.get("mid" + temp));
insert.put("quantity", (int) (ObjectFormatUtil.toDouble(map.get("quantity" + temp)) * 100)); insert.put("quantity", (int) (ObjectFormatUtil.toDouble(map.get("quantity" + temp)) * 100));
insert.put("applyRemark", map.get("applyRemark" + temp));
insert.put("code", map.get("code")); insert.put("code", map.get("code"));
insert.put("placeId", map.get("placeId")); insert.put("placeId", map.get("placeId"));
insert.put("unit", map.get("unit" + temp)); insert.put("unit", map.get("unit" + temp));
insert.put("project", map.get("project" + temp));
// 获取主订单编号 // 获取主订单编号
insert.put("parentId", id); insert.put("parentId", id);
if (map.containsKey("constructionUnitId" + temp)) {
String constructionUnitId = (String) map.get("constructionUnitId" + temp);
if (!"".equals(constructionUnitId)) {
insert.put("constructionUnitId", constructionUnitId);
}
}
if (map.containsKey("adminorgId" + temp)) {
String adminorgId = (String) map.get("adminorgId" + temp);
if ("".equals(adminorgId)) {
map.put("adminorgId", userToken.getMaindeparment());
} else {
map.put("adminorgId", adminorgId);
}
} else {
map.put("adminorgId", userToken.getMaindeparment());
}
// 插入子订单 // 插入子订单
integer += depositoryRecordService.insertApplicationOutMin(insert); integer += depositoryRecordService.insertApplicationOutMin(insert);
} }
if (map.containsKey("constructionUnitId")) {
String constructionUnitId = map.get("constructionUnitId").toString();
if ("".equals(constructionUnitId)) {
map.remove("constructionUnitId");
}
}
if (map.containsKey("adminorgId")) {
String adminorgId = map.get("adminorgId").toString();
if ("".equals(adminorgId)) {
map.put("adminorgId", userToken.getMaindeparment());
}
} else {
map.put("adminorgId", userToken.getMaindeparment());
}
// 插入子订单 // 插入子订单
map.put("parentId", id); map.put("parentId", id);
map.remove("id"); map.remove("id");
@ -1491,7 +1460,6 @@ public class DepositoryRecordController {
outRecord.put("code", mainRecord.get("code")); outRecord.put("code", mainRecord.get("code"));
outRecord.put("placeId", place); outRecord.put("placeId", place);
outRecord.put("unit", unit); outRecord.put("unit", unit);
outRecord.put("applyRemark", applyRemark);
outRecord.put("adminorgId", userToken.getMaindeparment()); outRecord.put("adminorgId", userToken.getMaindeparment());
success += depositoryRecordService.insertApplicationOutMin(outRecord); success += depositoryRecordService.insertApplicationOutMin(outRecord);
} else { } else {

69
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -1843,33 +1843,24 @@ public class PageController {
Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid()); Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid());
// 获取出库物料仓库信息 // 获取出库物料仓库信息
Depository depository = depositoryService.findDepositoryById(recordMinP.getDepositoryId()); Depository depository = depositoryService.findDepositoryById(recordMinP.getDepositoryId());
// 获取出库库位
Place placeById = placeService.findPlaceById(recordMinP.getPlaceId());
// 获取处理人
UserByPort userByPort = LinkInterfaceUtil.FindUserById(recordMinP.getCheckId(), userToken);
if (recordMinP.getAdminorgId() != null) {
Administration company = LinkInterfaceUtil.getCompany(recordMinP.getAdminorgId(), userToken); // 获取处理人
recordMinP.setAdminorgName(company.getName()); Integer checkId = recordMinP.getCheckId();
mv.addObject("adisplay", "table-row"); if (checkId != null) {
} else { UserByPort userByPort = LinkInterfaceUtil.FindUserById(checkId, userToken);
mv.addObject("adisplay", "none");
}
if (recordMinP.getConstructionUnitId() != null) {
ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(recordMinP.getConstructionUnitId());
recordMinP.setConstructionUnitName(constructionUnitById.getName());
mv.addObject("cdisplay", "table-row");
} else {
mv.addObject("cdisplay", "none");
}
// 设置处理人姓名 // 设置处理人姓名
recordMinP.setCheckerName(userByPort.getName()); recordMinP.setCheckerName(userByPort.getName());
// 获取出库库位
Place placeById = placeService.findPlaceById(recordMinP.getPlaceId());
recordMinP.setPlaceCode(placeById.getCode());
}
recordMinP.setDepositoryName(depository.getDname()); recordMinP.setDepositoryName(depository.getDname());
recordMinP.setMname(inventoryById.getMname()); recordMinP.setMname(inventoryById.getMname());
recordMinP.setMcode(inventoryById.getCode()); recordMinP.setMcode(inventoryById.getCode());
recordMinP.setVersion(inventoryById.getVersion() == null ? "" : inventoryById.getVersion()); recordMinP.setVersion(inventoryById.getVersion() == null ? "" : inventoryById.getVersion());
recordMinP.setPlaceCode(placeById.getCode());
String unit = recordMinP.getUnit(); String unit = recordMinP.getUnit();
if ("-1".equals(unit)) { if ("-1".equals(unit)) {
recordMinP.setUnit(inventoryById.getUnit()); recordMinP.setUnit(inventoryById.getUnit());
@ -1955,14 +1946,9 @@ public class PageController {
Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid()); Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid());
// 获取出库物料仓库信息 // 获取出库物料仓库信息
Depository depository = depositoryService.findDepositoryById(recordMinP.getDepositoryId()); Depository depository = depositoryService.findDepositoryById(recordMinP.getDepositoryId());
// 获取出库库位
Place placeById = placeService.findPlaceById(recordMinP.getPlaceId());
if (placeById != null) {
placeCode.append(placeById.getCode()).append(",");
}
recordMinP.setMname(inventoryById.getMname()); recordMinP.setMname(inventoryById.getMname());
recordMinP.setDepositoryName(depository.getDname()); recordMinP.setDepositoryName(depository.getDname());
recordMinP.setPlaceCode(placeById.getCode());
Integer checkId = recordMinP.getCheckId(); Integer checkId = recordMinP.getCheckId();
if (checkId != null) { if (checkId != null) {
// 如果当前子订单已经处理 // 如果当前子订单已经处理
@ -1970,6 +1956,12 @@ public class PageController {
UserByPort disposer = LinkInterfaceUtil.FindUserById(checkId, userToken); UserByPort disposer = LinkInterfaceUtil.FindUserById(checkId, userToken);
outDisposer.append(disposer.getName()).append(","); outDisposer.append(disposer.getName()).append(",");
recordMinP.setCheckerName(disposer.getName()); recordMinP.setCheckerName(disposer.getName());
// 获取出库库位
Place placeById = placeService.findPlaceById(recordMinP.getPlaceId());
if (placeById != null) {
placeCode.append(placeById.getCode()).append(",");
recordMinP.setPlaceCode(placeById.getCode());
}
} else { } else {
outDisposer.append("暂未处理,"); outDisposer.append("暂未处理,");
recordMinP.setCheckerName("暂未处理"); recordMinP.setCheckerName("暂未处理");
@ -2047,6 +2039,25 @@ public class PageController {
depositoryManager.add(user); depositoryManager.add(user);
depositoryManagerNames.append(user.getName()); depositoryManagerNames.append(user.getName());
} }
Integer adminorgId = applicationOutRecordPById.getAdminorgId();
Integer constructionUnitId = applicationOutRecordPById.getConstructionUnitId();
if(adminorgId != null){
Administration company = LinkInterfaceUtil.getCompany(adminorgId, userToken);
applicationOutRecordPById.setAdminorgName(company.getName()); mv.addObject("adisplay", "table-row");
}else {
mv.addObject("adisplay", "none");
}
if(constructionUnitId != null){
ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(constructionUnitId);
applicationOutRecordPById.setConstructionUnitName(constructionUnitById.getName());
mv.addObject("cdisplay", "table-row");
}else {
mv.addObject("cdisplay", "none");
}
applicationOutRecordPById.setApplicantName(userByPort.getName()); applicationOutRecordPById.setApplicantName(userByPort.getName());
applicationOutRecordPById.setDepartmentheadName(departmentHeadName.toString()); applicationOutRecordPById.setDepartmentheadName(departmentHeadName.toString());
applicationOutRecordPById.setDepositoryManagerName(depositoryManagerNames.toString()); applicationOutRecordPById.setDepositoryManagerName(depositoryManagerNames.toString());
@ -3031,13 +3042,13 @@ public class PageController {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
if (param.containsKey("id")) { if (param.containsKey("id")) {
String type = param.get("type"); String type = param.get("type");
mv.addObject("id",param.get("id")); mv.addObject("id", param.get("id"));
if("m".equals(type)){ if ("m".equals(type)) {
// 如果是物料 // 如果是物料
mv.setViewName("pages/showInventory/showInventoryForMaterial"); mv.setViewName("pages/showInventory/showInventoryForMaterial");
}else if("d".equals(type) || "p".equals(type)){ } else if ("d".equals(type) || "p".equals(type)) {
mv.addObject("type",type); mv.addObject("type", type);
// 如果是位置 // 如果是位置
mv.setViewName("pages/showInventory/showInventoryForLocation"); mv.setViewName("pages/showInventory/showInventoryForLocation");
} }

12
src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java
View File

@ -169,6 +169,18 @@ public class ApplicationOutRecord {
*/ */
private String outTime; private String outTime;
/**
* 摘要
*/
private String abstracts;
/**
* 出库类别
*/
private String outType;
} }

9
src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java
View File

@ -69,14 +69,9 @@ public class ApplicationOutRecordMin {
*/ */
private String mname; private String mname;
/** /**
* 施工单位id * 项目
*/ */
private Integer constructionUnitId; private String project;
/**
* 部门id
*/
private Integer adminorgId;
} }

52
src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
View File

@ -113,8 +113,10 @@
<result column="placeId" property="placeId" jdbcType="INTEGER"/> <result column="placeId" property="placeId" jdbcType="INTEGER"/>
<result column="pass" property="pass" jdbcType="INTEGER"/> <result column="pass" property="pass" jdbcType="INTEGER"/>
<result column="aormUnit" property="unit" jdbcType="VARCHAR"/> <result column="aormUnit" property="unit" jdbcType="VARCHAR"/>
<result column="aormconstructionunitid" property="constructionUnitId" jdbcType="INTEGER"/> <result column="abstract" property="abstracts" jdbcType="VARCHAR"/>
<result column="aormadminorgid" property="adminorgId" jdbcType="INTEGER"/> <result column="outType" property="outType" jdbcType="VARCHAR"/>
<result column="aorconstructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
<result column="aoradminorgid" property="adminorgId" jdbcType="INTEGER"/>
<result column="outTime" property="outTime" jdbcType="INTEGER"/> <result column="outTime" property="outTime" jdbcType="INTEGER"/>
</resultMap> </resultMap>
@ -131,8 +133,6 @@
<result column="code" property="code" jdbcType="VARCHAR"/> <result column="code" property="code" jdbcType="VARCHAR"/>
<result column="transferId" property="transferId" jdbcType="INTEGER"/> <result column="transferId" property="transferId" jdbcType="INTEGER"/>
<result column="unit" property="unit" jdbcType="VARCHAR"/> <result column="unit" property="unit" jdbcType="VARCHAR"/>
<result column="constructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
<result column="adminorgid" property="adminorgId" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<!-- 表查询字段 --> <!-- 表查询字段 -->
@ -170,12 +170,12 @@
<sql id="ApplicationOutRecordInfo"> <sql id="ApplicationOutRecordInfo">
aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aormconstructionunitid,aormadminorgid,cuname, depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname,
cuintroduce,cuaddress,outTime cuintroduce,cuaddress,outTime,abstract,outType
</sql> </sql>
<sql id="ApplicationOutRecordMinInfo"> <sql id="ApplicationOutRecordMinInfo">
aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.constructionunitid,aorm.adminorgid aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.project
</sql> </sql>
<!-- 查询所有数据行数 --> <!-- 查询所有数据行数 -->
<select id="findCount" resultType="integer"> <select id="findCount" resultType="integer">
@ -1019,7 +1019,7 @@
<insert id="insertApplicationOutRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id"> <insert id="insertApplicationOutRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
insert into application_out_record insert into application_out_record
(id,applicant_id,applicant_time,code,price,quantity,departmenthead,departmenthead_pass,departmenthead_time, (id,applicant_id,applicant_time,code,price,quantity,departmenthead,departmenthead_pass,departmenthead_time,
departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,depository_manager_message,apply_remark,state,istransfer,placeId,pass) departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,depository_manager_message,apply_remark,state,istransfer,placeId,pass,constructionunitid,adminorgid,outType,abstract)
values( values(
#{id}, #{id},
#{applicantId}, #{applicantId},
@ -1060,13 +1060,17 @@
#{state}, #{state},
#{istransfer}, #{istransfer},
#{placeId}, #{placeId},
#{pass} #{pass},
#{constructionUnitId},
#{adminorgId},
#{outType},
#{abstract}
) )
</insert> </insert>
<!-- 插入一条出库子订单--> <!-- 插入一条出库子订单-->
<insert id="insertApplicationOutRecordMin" parameterType="map" useGeneratedKeys="true" keyProperty="id"> <insert id="insertApplicationOutRecordMin" parameterType="map" useGeneratedKeys="true" keyProperty="id">
insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,constructionunitid,adminorgid) insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,project)
values( values(
#{id}, #{id},
#{mid}, #{mid},
@ -1079,8 +1083,7 @@
#{transferId}, #{transferId},
#{trueOut}, #{trueOut},
#{unit}, #{unit},
#{constructionUnitId}, #{project}
#{adminorgId}
) )
</insert> </insert>
@ -1140,6 +1143,9 @@
<if test="trueOut != null"> <if test="trueOut != null">
and arom.trueOut = #{trueOut} and arom.trueOut = #{trueOut}
</if> </if>
<if test="project != null">
and arom.project = #{project}
</if>
</select> </select>
@ -1339,17 +1345,12 @@
<if test="parentId != null "> <if test="parentId != null ">
parentId = #{parentId}, parentId = #{parentId},
</if> </if>
<if test="trueOut != null"> <if test="project != null ">
trueOut = #{trueOut}, project = #{project},
</if> </if>
<if test="constructionUnitId != null and constructionUnitId != ''"> <if test="trueOut != null">
constructionunitid = #{constructionUnitId}, trueOut = #{trueOut}
</if>
<if test="adminorgId != null and adminorgId != ''">
adminorgid = #{adminorgId}
</if> </if>
where id = #{id} where id = #{id}
</set> </set>
@ -1448,6 +1449,15 @@
<if test="outTime != null"> <if test="outTime != null">
outTime = #{outTime}, outTime = #{outTime},
</if> </if>
<if test="constructionUnitId != null and constructionUnitId != ''">
constructionunitid = #{constructionUnitId},
</if>
<if test="adminorgId != null and adminorgId != ''">
adminorgid = #{adminorgId},
</if>
<if test="outType != null and outType != ''">
outType = #{outType},
</if>
<if test="pass != null and pass != ''"> <if test="pass != null and pass != ''">
pass = #{pass} pass = #{pass}
</if> </if>

25
src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java
View File

@ -101,30 +101,16 @@ public class ApplicationOutRecordMinP {
*/ */
private Integer transferId; private Integer transferId;
/**
* 施工单位id
*/
private Integer constructionUnitId;
/**
* 施工单位名称
*/
private String constructionUnitName;
/** /**
* 部门id * 已经出库的数量
*/ */
private Integer adminorgId; private Double trueOut;
/** /**
* 部门名称 * 项目
*/
private String adminorgName;
/**
* 已经出库的数量
*/ */
private Double trueOut; private String project;
@ -140,8 +126,7 @@ public class ApplicationOutRecordMinP {
this.placeId = recordMin.getPlaceId(); this.placeId = recordMin.getPlaceId();
this.unit = recordMin.getUnit(); this.unit = recordMin.getUnit();
this.transferId = recordMin.getTransferId(); this.transferId = recordMin.getTransferId();
this.constructionUnitId = recordMin.getConstructionUnitId();
this.adminorgId = recordMin.getAdminorgId();
this.trueOut =(double) (recordMin.getTrueOut() / 100); this.trueOut =(double) (recordMin.getTrueOut() / 100);
this.project = recordMin.getProject();
} }
} }

18
src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java
View File

@ -172,6 +172,22 @@ public class ApplicationOutRecordP {
private String outTime; private String outTime;
/**
* 部门名称
*/
private String adminorgName;
/**
* 摘要
*/
private String abstracts;
/**
* 出库类别
*/
private String outType;
public ApplicationOutRecordP(ApplicationOutRecord aor) { public ApplicationOutRecordP(ApplicationOutRecord aor) {
this.id = aor.getId(); this.id = aor.getId();
this.mid = aor.getMid(); this.mid = aor.getMid();
@ -206,5 +222,7 @@ public class ApplicationOutRecordP {
this.constructionUnitName = aor.getConstructionUnitName(); this.constructionUnitName = aor.getConstructionUnitName();
this.adminorgId = aor.getAdminorgId(); this.adminorgId = aor.getAdminorgId();
this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime())); this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime()));
this.abstracts = aor.getAbstracts();
this.outType = aor.getOutType();
} }
} }

3
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
View File

@ -3765,8 +3765,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
@Override @Override
public ApplicationOutRecordP findApplicationOutRecordPById(Integer id) { public ApplicationOutRecordP findApplicationOutRecordPById(Integer id) {
ApplicationOutRecord record = depositoryRecordMapper.findApplicationOutRecordPById(id); ApplicationOutRecord record = depositoryRecordMapper.findApplicationOutRecordPById(id);
ApplicationOutRecordP recordP = new ApplicationOutRecordP(record); return new ApplicationOutRecordP(record);
return recordP;
} }
/** /**

7
src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
View File

@ -514,7 +514,7 @@ public class ExcelServiceImpl implements ExcelService {
// 设置制单人名称 // 设置制单人名称
excelInfoByWrite.setProducerName(userToken.getName()); excelInfoByWrite.setProducerName(userToken.getName());
// 定义部门id // 定义部门id
Integer adminorgId = null; Integer adminorgId = record.getAdminorgId();
// 定义部门 // 定义部门
Administration company = null; Administration company = null;
for (int i = 1; i <= pagesum; i++) { for (int i = 1; i <= pagesum; i++) {
@ -565,10 +565,7 @@ public class ExcelServiceImpl implements ExcelService {
dataMin.add(excelInfoByMinWrite); dataMin.add(excelInfoByMinWrite);
// 添加总数 // 添加总数
total += (double) (recordMin.getQuantity() / 100); total += (double) (recordMin.getQuantity() / 100);
if (adminorgId == null) {
// 如果没有选择部门
adminorgId = recordMin.getAdminorgId();
}
} }
if (adminorgId != null && company == null) { if (adminorgId != null && company == null) {
company = LinkInterfaceUtil.getCompany(adminorgId, userToken); company = LinkInterfaceUtil.getCompany(adminorgId, userToken);

8
src/main/resources/templates/pages/application/form-step-look_back.html
View File

@ -46,6 +46,14 @@
<td>仓库名称</td> <td>仓库名称</td>
<td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td> <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>
</tr> </tr>
<tr th:style="'display:'+${adisplay}">
<td>部门</td>
<td id="adminorg" th:text="${record.getAdminorgName()}">部门</td>
</tr>
<tr th:style="'display:'+${cdisplay}">
<td>施工单位</td>
<td id="constructUnitId" th:text="${record.getConstructionUnitName()}">施工单位</td>
</tr>
<tr> <tr>
<td>处理人</td> <td>处理人</td>
<td th:text="${outDisposer}"></td> <td th:text="${outDisposer}"></td>

9
src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
View File

@ -66,15 +66,6 @@
<td>转入位置</td> <td>转入位置</td>
<td id="location" th:text="${toLocation}">2016-11-28</td> <td id="location" th:text="${toLocation}">2016-11-28</td>
</tr> </tr>
<tr th:style="'display:'+${adisplay}">
<td>部门</td>
<td id="adminorg" th:text="${recordMinP.getAdminorgName()}">外芯仓库</td>
</tr>
<tr th:style="'display:'+${cdisplay}">
<td>施工单位</td>
<td id="constructionUnit" th:text="${recordMinP.getConstructionUnitName()}">外芯仓库</td>
</tr>
<tr> <tr>

261
src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
View File

@ -59,6 +59,54 @@
<div> <div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;"> <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
<div class="layui-card" id="cardParent"> <div class="layui-card" id="cardParent">
<div class="layui-form-item">
<label class="layui-form-label">部门:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id="openCompanyAdminorg"
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgId"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnit"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitId"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">摘要:</label>
<div class="layui-input-block">
<input name="abstract" placeholder="请填写摘要" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">出库类别:</label>
<div class="layui-input-block">
<input name="outType" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-card-body" id="cardItem"> <div class="layui-card-body" id="cardItem">
<hr> <hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" <i class="layui-icon layui-icon-subtraction" style="display: inline"
@ -127,35 +175,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">部门:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input" <input name="project" placeholder="请填写相关项目" value="" id="project"
readonly
id="openCompanyAdminorg"
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgId"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnit"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitId"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -198,6 +220,54 @@
<div> <div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;"> <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
<div class="layui-card" id="cardParentForGroup"> <div class="layui-card" id="cardParentForGroup">
<div class="layui-form-item">
<label class="layui-form-label">部门:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id="openCompanyAdminorgForGroup"
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnitForGroup"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">摘要:</label>
<div class="layui-input-block">
<input name="abstract" placeholder="请填写摘要" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">出库类别:</label>
<div class="layui-input-block">
<input name="outType" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-card-body" id="cardItemForGroup"> <div class="layui-card-body" id="cardItemForGroup">
<hr> <hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" <i class="layui-icon layui-icon-subtraction" style="display: inline"
@ -242,36 +312,11 @@
required lay-verify="number" placeholder="请填写组合数量"/> required lay-verify="number" placeholder="请填写组合数量"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">部门:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id="openCompanyAdminorgForGroup"
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnitForGroup"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value="" <input name="project" placeholder="请填写相关项目" value="" id="project"
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -421,7 +466,7 @@
elem: '#stepForm', elem: '#stepForm',
filter: 'stepForm', filter: 'stepForm',
width: '100%', //设置容器宽度 width: '100%', //设置容器宽度
height: '600px', height: '700px',
stepItems: [{ stepItems: [{
title: '填写信息' title: '填写信息'
}, { }, {
@ -637,35 +682,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">部门:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input" <input id=`+"project"+NewIdNumber+` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
readonly
id=` + "openCompanyAdminorg" + NewIdNumber + `
onclick="selectPost(this)"
/>
<input type="text" name=` + "adminorgId" + NewIdNumber + ` class="layui-input"
id=` + "adminorgId" + NewIdNumber + `
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id=` + "openConstructionUnit" + NewIdNumber + `
onclick="selectConstructionUnit(this)"
/>
<input type="text" name=` + "constructionUnitId" + NewIdNumber + ` class="layui-input"
id=` + "constructionUnitId" + NewIdNumber + `
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -674,7 +693,7 @@
// 获取当前高度 // 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber); params.push(NewIdNumber);
$("#stepForm").css("height", height + 483 + 'px'); $("#stepForm").css("height", height + 387 + 'px');
$("#" + parentId).after(materialItem); $("#" + parentId).after(materialItem);
}; };
@ -724,35 +743,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">部门:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id=` + "openCompanyAdminorgForGroup" + NewIdNumber + `
onclick="selectPost(this)"
/>
<input type="text" name=` + "adminorgId" + NewIdNumber + ` class="layui-input"
id=` + "adminorgIdForGroup" + NewIdNumber + `
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input" <input id=`+"project"+NewIdNumber+` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
readonly
id=` + "openConstructionUnitForGroup" + NewIdNumber + `
onclick="selectConstructionUnit(this)"
/>
<input type="text" name=` + "constructionUnitId" + NewIdNumber + ` class="layui-input"
id=` + "constructionUnitIdForGroup" + NewIdNumber + `
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -764,7 +757,7 @@
// 获取当前高度 // 获取当前高度
var height = parseInt(($("#stepForm2").css('height')).split("px")[0]); var height = parseInt(($("#stepForm2").css('height')).split("px")[0]);
params2.push(NewIdNumber); params2.push(NewIdNumber);
$("#stepForm2").css("height", height + 385 + 'px'); $("#stepForm2").css("height", height + 289 + 'px');
$("#" + parentId).after(materialItem); $("#" + parentId).after(materialItem);
}; };
@ -842,7 +835,7 @@
// 获取祖父节点 // 获取祖父节点
var reparent = parent.parentNode; var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height", height - 422 + 'px'); $("#stepForm").css("height", height - 387 + 'px');
params = remove(params, parentId); params = remove(params, parentId);
reparent.removeChild(parent); reparent.removeChild(parent);
}; };
@ -1428,7 +1421,7 @@
var req = {}; var req = {};
req.qrCode = result; req.qrCode = result;
req.codeFlag = 1; req.codeFlag = 1;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/qywxApplicationOutScanBarCode", url: "/material/qywxApplicationOutScanBarCode",
type: "post", type: "post",
@ -1485,6 +1478,8 @@
}) })
} }
}) })
}; };
// 用于扫码功能 // 用于扫码功能
@ -1506,7 +1501,7 @@
var req = {}; var req = {};
req.qrCode = result; req.qrCode = result;
req.codeFlag = 2; req.codeFlag = 2;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/qywxApplicationOutScanQrCode", url: "/material/qywxApplicationOutScanQrCode",
type: "post", type: "post",
@ -1717,6 +1712,36 @@
var iframeChildren = $(content.children()); var iframeChildren = $(content.children());
content.css('height', '100%'); content.css('height', '100%');
iframeChildren.css('height', '100%'); iframeChildren.css('height', '100%');
},
end:function () {
let val = $("#"+id).val();
if(val !== ""){
if(id.indexOf("ForGroup") !== -1){
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify","required")
})
}else{
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify","required")
})
}
}else{
if(id.indexOf("ForGroup") !== -1){
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
}else{
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
}
}
} }
}); });
}; };

2
src/main/resources/templates/pages/user/login.html
View File

@ -207,7 +207,7 @@
layer = layui.layer; layer = layui.layer;
// 登录过期的时候，跳出ifram框架 // 登录过期的时候，跳出ifram框架
if (top.location != self.location) top.location = self.location; if (top.location !== self.location) top.location = self.location;
// 粒子线条背景 // 粒子线条背景
$(document).ready(function () { $(document).ready(function () {

52
target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
View File

@ -113,8 +113,10 @@
<result column="placeId" property="placeId" jdbcType="INTEGER"/> <result column="placeId" property="placeId" jdbcType="INTEGER"/>
<result column="pass" property="pass" jdbcType="INTEGER"/> <result column="pass" property="pass" jdbcType="INTEGER"/>
<result column="aormUnit" property="unit" jdbcType="VARCHAR"/> <result column="aormUnit" property="unit" jdbcType="VARCHAR"/>
<result column="aormconstructionunitid" property="constructionUnitId" jdbcType="INTEGER"/> <result column="abstract" property="abstracts" jdbcType="VARCHAR"/>
<result column="aormadminorgid" property="adminorgId" jdbcType="INTEGER"/> <result column="outType" property="outType" jdbcType="VARCHAR"/>
<result column="aorconstructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
<result column="aoradminorgid" property="adminorgId" jdbcType="INTEGER"/>
<result column="outTime" property="outTime" jdbcType="INTEGER"/> <result column="outTime" property="outTime" jdbcType="INTEGER"/>
</resultMap> </resultMap>
@ -131,8 +133,6 @@
<result column="code" property="code" jdbcType="VARCHAR"/> <result column="code" property="code" jdbcType="VARCHAR"/>
<result column="transferId" property="transferId" jdbcType="INTEGER"/> <result column="transferId" property="transferId" jdbcType="INTEGER"/>
<result column="unit" property="unit" jdbcType="VARCHAR"/> <result column="unit" property="unit" jdbcType="VARCHAR"/>
<result column="constructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
<result column="adminorgid" property="adminorgId" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<!-- 表查询字段 --> <!-- 表查询字段 -->
@ -170,12 +170,12 @@
<sql id="ApplicationOutRecordInfo"> <sql id="ApplicationOutRecordInfo">
aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aormconstructionunitid,aormadminorgid,cuname, depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname,
cuintroduce,cuaddress,outTime cuintroduce,cuaddress,outTime,abstract,outType
</sql> </sql>
<sql id="ApplicationOutRecordMinInfo"> <sql id="ApplicationOutRecordMinInfo">
aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.constructionunitid,aorm.adminorgid aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.project
</sql> </sql>
<!-- 查询所有数据行数 --> <!-- 查询所有数据行数 -->
<select id="findCount" resultType="integer"> <select id="findCount" resultType="integer">
@ -1019,7 +1019,7 @@
<insert id="insertApplicationOutRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id"> <insert id="insertApplicationOutRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
insert into application_out_record insert into application_out_record
(id,applicant_id,applicant_time,code,price,quantity,departmenthead,departmenthead_pass,departmenthead_time, (id,applicant_id,applicant_time,code,price,quantity,departmenthead,departmenthead_pass,departmenthead_time,
departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,depository_manager_message,apply_remark,state,istransfer,placeId,pass) departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,depository_manager_message,apply_remark,state,istransfer,placeId,pass,constructionunitid,adminorgid,outType,abstract)
values( values(
#{id}, #{id},
#{applicantId}, #{applicantId},
@ -1060,13 +1060,17 @@
#{state}, #{state},
#{istransfer}, #{istransfer},
#{placeId}, #{placeId},
#{pass} #{pass},
#{constructionUnitId},
#{adminorgId},
#{outType},
#{abstract}
) )
</insert> </insert>
<!-- 插入一条出库子订单--> <!-- 插入一条出库子订单-->
<insert id="insertApplicationOutRecordMin" parameterType="map" useGeneratedKeys="true" keyProperty="id"> <insert id="insertApplicationOutRecordMin" parameterType="map" useGeneratedKeys="true" keyProperty="id">
insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,constructionunitid,adminorgid) insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,project)
values( values(
#{id}, #{id},
#{mid}, #{mid},
@ -1079,8 +1083,7 @@
#{transferId}, #{transferId},
#{trueOut}, #{trueOut},
#{unit}, #{unit},
#{constructionUnitId}, #{project}
#{adminorgId}
) )
</insert> </insert>
@ -1140,6 +1143,9 @@
<if test="trueOut != null"> <if test="trueOut != null">
and arom.trueOut = #{trueOut} and arom.trueOut = #{trueOut}
</if> </if>
<if test="project != null">
and arom.project = #{project}
</if>
</select> </select>
@ -1339,17 +1345,12 @@
<if test="parentId != null "> <if test="parentId != null ">
parentId = #{parentId}, parentId = #{parentId},
</if> </if>
<if test="trueOut != null"> <if test="project != null ">
trueOut = #{trueOut}, project = #{project},
</if> </if>
<if test="constructionUnitId != null and constructionUnitId != ''"> <if test="trueOut != null">
constructionunitid = #{constructionUnitId}, trueOut = #{trueOut}
</if>
<if test="adminorgId != null and adminorgId != ''">
adminorgid = #{adminorgId}
</if> </if>
where id = #{id} where id = #{id}
</set> </set>
@ -1448,6 +1449,15 @@
<if test="outTime != null"> <if test="outTime != null">
outTime = #{outTime}, outTime = #{outTime},
</if> </if>
<if test="constructionUnitId != null and constructionUnitId != ''">
constructionunitid = #{constructionUnitId},
</if>
<if test="adminorgId != null and adminorgId != ''">
adminorgid = #{adminorgId},
</if>
<if test="outType != null and outType != ''">
outType = #{outType},
</if>
<if test="pass != null and pass != ''"> <if test="pass != null and pass != ''">
pass = #{pass} pass = #{pass}
</if> </if>

8
target/classes/templates/pages/application/form-step-look_back.html
View File

@ -46,6 +46,14 @@
<td>仓库名称</td> <td>仓库名称</td>
<td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td> <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>
</tr> </tr>
<tr th:style="'display:'+${adisplay}">
<td>部门</td>
<td id="adminorg" th:text="${record.getAdminorgName()}">部门</td>
</tr>
<tr th:style="'display:'+${cdisplay}">
<td>施工单位</td>
<td id="constructUnitId" th:text="${record.getConstructionUnitName()}">施工单位</td>
</tr>
<tr> <tr>
<td>处理人</td> <td>处理人</td>
<td th:text="${outDisposer}"></td> <td th:text="${outDisposer}"></td>

9
target/classes/templates/pages/application/form-step-look_minRecordOut.html
View File

@ -66,15 +66,6 @@
<td>转入位置</td> <td>转入位置</td>
<td id="location" th:text="${toLocation}">2016-11-28</td> <td id="location" th:text="${toLocation}">2016-11-28</td>
</tr> </tr>
<tr th:style="'display:'+${adisplay}">
<td>部门</td>
<td id="adminorg" th:text="${recordMinP.getAdminorgName()}">外芯仓库</td>
</tr>
<tr th:style="'display:'+${cdisplay}">
<td>施工单位</td>
<td id="constructionUnit" th:text="${recordMinP.getConstructionUnitName()}">外芯仓库</td>
</tr>
<tr> <tr>

261
target/classes/templates/pages/applicationForStorageCenter/application-out.html
View File

@ -59,6 +59,54 @@
<div> <div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;"> <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
<div class="layui-card" id="cardParent"> <div class="layui-card" id="cardParent">
<div class="layui-form-item">
<label class="layui-form-label">部门:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id="openCompanyAdminorg"
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgId"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnit"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitId"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">摘要:</label>
<div class="layui-input-block">
<input name="abstract" placeholder="请填写摘要" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">出库类别:</label>
<div class="layui-input-block">
<input name="outType" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-card-body" id="cardItem"> <div class="layui-card-body" id="cardItem">
<hr> <hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" <i class="layui-icon layui-icon-subtraction" style="display: inline"
@ -127,35 +175,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">部门:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input" <input name="project" placeholder="请填写相关项目" value="" id="project"
readonly
id="openCompanyAdminorg"
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgId"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnit"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitId"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -198,6 +220,54 @@
<div> <div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;"> <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
<div class="layui-card" id="cardParentForGroup"> <div class="layui-card" id="cardParentForGroup">
<div class="layui-form-item">
<label class="layui-form-label">部门:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id="openCompanyAdminorgForGroup"
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnitForGroup"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">摘要:</label>
<div class="layui-input-block">
<input name="abstract" placeholder="请填写摘要" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">出库类别:</label>
<div class="layui-input-block">
<input name="outType" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<div class="layui-card-body" id="cardItemForGroup"> <div class="layui-card-body" id="cardItemForGroup">
<hr> <hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" <i class="layui-icon layui-icon-subtraction" style="display: inline"
@ -242,36 +312,11 @@
required lay-verify="number" placeholder="请填写组合数量"/> required lay-verify="number" placeholder="请填写组合数量"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">部门:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id="openCompanyAdminorgForGroup"
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnitForGroup"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value="" <input name="project" placeholder="请填写相关项目" value="" id="project"
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -421,7 +466,7 @@
elem: '#stepForm', elem: '#stepForm',
filter: 'stepForm', filter: 'stepForm',
width: '100%', //设置容器宽度 width: '100%', //设置容器宽度
height: '600px', height: '700px',
stepItems: [{ stepItems: [{
title: '填写信息' title: '填写信息'
}, { }, {
@ -637,35 +682,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">部门:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input" <input id=`+"project"+NewIdNumber+` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
readonly
id=` + "openCompanyAdminorg" + NewIdNumber + `
onclick="selectPost(this)"
/>
<input type="text" name=` + "adminorgId" + NewIdNumber + ` class="layui-input"
id=` + "adminorgId" + NewIdNumber + `
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id=` + "openConstructionUnit" + NewIdNumber + `
onclick="selectConstructionUnit(this)"
/>
<input type="text" name=` + "constructionUnitId" + NewIdNumber + ` class="layui-input"
id=` + "constructionUnitId" + NewIdNumber + `
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -674,7 +693,7 @@
// 获取当前高度 // 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber); params.push(NewIdNumber);
$("#stepForm").css("height", height + 483 + 'px'); $("#stepForm").css("height", height + 387 + 'px');
$("#" + parentId).after(materialItem); $("#" + parentId).after(materialItem);
}; };
@ -724,35 +743,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">部门:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id=` + "openCompanyAdminorgForGroup" + NewIdNumber + `
onclick="selectPost(this)"
/>
<input type="text" name=` + "adminorgId" + NewIdNumber + ` class="layui-input"
id=` + "adminorgIdForGroup" + NewIdNumber + `
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input" <input id=`+"project"+NewIdNumber+` name=` + "project" + NewIdNumber + ` placeholder="请填写相关项目" value=""
readonly
id=` + "openConstructionUnitForGroup" + NewIdNumber + `
onclick="selectConstructionUnit(this)"
/>
<input type="text" name=` + "constructionUnitId" + NewIdNumber + ` class="layui-input"
id=` + "constructionUnitIdForGroup" + NewIdNumber + `
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -764,7 +757,7 @@
// 获取当前高度 // 获取当前高度
var height = parseInt(($("#stepForm2").css('height')).split("px")[0]); var height = parseInt(($("#stepForm2").css('height')).split("px")[0]);
params2.push(NewIdNumber); params2.push(NewIdNumber);
$("#stepForm2").css("height", height + 385 + 'px'); $("#stepForm2").css("height", height + 289 + 'px');
$("#" + parentId).after(materialItem); $("#" + parentId).after(materialItem);
}; };
@ -842,7 +835,7 @@
// 获取祖父节点 // 获取祖父节点
var reparent = parent.parentNode; var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height", height - 422 + 'px'); $("#stepForm").css("height", height - 387 + 'px');
params = remove(params, parentId); params = remove(params, parentId);
reparent.removeChild(parent); reparent.removeChild(parent);
}; };
@ -1428,7 +1421,7 @@
var req = {}; var req = {};
req.qrCode = result; req.qrCode = result;
req.codeFlag = 1; req.codeFlag = 1;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/qywxApplicationOutScanBarCode", url: "/material/qywxApplicationOutScanBarCode",
type: "post", type: "post",
@ -1485,6 +1478,8 @@
}) })
} }
}) })
}; };
// 用于扫码功能 // 用于扫码功能
@ -1506,7 +1501,7 @@
var req = {}; var req = {};
req.qrCode = result; req.qrCode = result;
req.codeFlag = 2; req.codeFlag = 2;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/qywxApplicationOutScanQrCode", url: "/material/qywxApplicationOutScanQrCode",
type: "post", type: "post",
@ -1717,6 +1712,36 @@
var iframeChildren = $(content.children()); var iframeChildren = $(content.children());
content.css('height', '100%'); content.css('height', '100%');
iframeChildren.css('height', '100%'); iframeChildren.css('height', '100%');
},
end:function () {
let val = $("#"+id).val();
if(val !== ""){
if(id.indexOf("ForGroup") !== -1){
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify","required")
})
}else{
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify","required")
})
}
}else{
if(id.indexOf("ForGroup") !== -1){
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
}else{
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
}
}
} }
}); });
}; };

2
target/classes/templates/pages/user/login.html
View File

@ -207,7 +207,7 @@
layer = layui.layer; layer = layui.layer;
// 登录过期的时候，跳出ifram框架 // 登录过期的时候，跳出ifram框架
if (top.location != self.location) top.location = self.location; if (top.location !== self.location) top.location = self.location;
// 粒子线条背景 // 粒子线条背景
$(document).ready(function () { $(document).ready(function () {

Write Preview
Loading…
Cancel
Save