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
a231cbeed9
commit
3552d8c310
12 changed files with 213 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 18
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 10
      src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java
  4. 48
      src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  5. 22
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java
  6. 13
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java
  7. 4
      src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java
  8. 6
      src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java
  9. 11
      src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
  10. 24
      src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
  11. 48
      target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  12. 11
      target/classes/templates/pages/application/form-step-look_minRecordOut.html

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

@ -466,6 +466,15 @@ public class DepositoryRecordController {
map.remove("id");
map.put("parentId", id);
}
String constructionUnitId = map.get("constructionUnitId").toString();
String adminorgId = map.get("adminorgId").toString();
if("".equals(constructionUnitId))
{
map.remove("constructionUnitId");
}
if("".equals(adminorgId)){
map.put("adminorgId",userToken.getMaindeparment());
}
integer += depositoryRecordService.insertApplicationOutMin(map);
// 开启一个线程执行发送信息操作
@ -533,9 +542,29 @@ public class DepositoryRecordController {
insert.put("unit", map.get("unit" + temp));
// 获取主订单编号
insert.put("parentId", id);
String constructionUnitId = (String) map.get("constructionUnitId"+temp);
String adminorgId = (String) map.get("adminorgId"+temp);
if(!"".equals(constructionUnitId))
{
insert.put("constructionUnitId",constructionUnitId);
}
if("".equals(adminorgId)){
map.put("adminorgId",userToken.getMaindeparment());
}else{
map.put("adminorgId",adminorgId);
}
// 插入子订单
integer += depositoryRecordService.insertApplicationOutMin(insert);
}
String constructionUnitId = map.get("constructionUnitId").toString();
String adminorgId = map.get("adminorgId").toString();
if("".equals(constructionUnitId))
{
map.remove("constructionUnitId");
}
if("".equals(adminorgId)){
map.put("adminorgId",userToken.getMaindeparment());
}
// 插入子订单
map.put("parentId", id);
map.remove("id");

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

@ -1820,6 +1820,22 @@ public class PageController {
Place placeById = placeService.findPlaceById(recordMin.getPlaceId());
// 获取处理人
UserByPort userByPort = LinkInterfaceUtil.FindUserById(recordMin.getCheckId(), userToken);
if(recordMinP.getAdminorgId() != null){
Administration company = LinkInterfaceUtil.getCompany(recordMinP.getAdminorgId(), userToken);
recordMinP.setAdminorgName(company.getName());
mv.addObject("adisplay", "table-row");
}else{
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.setDepositoryName(depository.getDname());
@ -1904,7 +1920,7 @@ public class PageController {
List<ApplicationOutRecordMinP> recordMinPList = new ArrayList<>();
// 当前总额
Double sumPrice = 0.0;
double sumPrice = 0.0;
for (ApplicationOutRecordMin applicationOutRecordMin : applicationOutRecordMinByParent) {
// 获取子订单信息
// 获取输出子订单信息

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

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

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

@ -113,7 +113,8 @@
<result column="placeId" property="placeId" jdbcType="INTEGER"/>
<result column="pass" property="pass" jdbcType="INTEGER"/>
<result column="aormUnit" property="unit" jdbcType="VARCHAR"/>
<result column="aormconstructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
<result column="aormadminorgid" property="adminorgId" jdbcType="INTEGER"/>
</resultMap>
@ -129,6 +130,8 @@
<result column="code" property="code" jdbcType="VARCHAR"/>
<result column="transferId" property="transferId" jdbcType="INTEGER"/>
<result column="unit" property="unit" jdbcType="VARCHAR"/>
<result column="constructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
<result column="adminorgid" property="adminorgId" jdbcType="INTEGER"/>
</resultMap>
<!-- 表查询字段 -->
@ -166,11 +169,12 @@
<sql id="ApplicationOutRecordInfo">
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
depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aormconstructionunitid,aormadminorgid,cuname,
cuintroduce,cuaddress
</sql>
<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.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
</sql>
<!-- 查询所有数据行数 -->
<select id="findCount" resultType="integer">
@ -575,6 +579,12 @@
<if test="placeId != null">
and placeId = #{placeId}
</if>
<if test="adminorgid != null and adminorgid != ''">
and adminorgid = #{adminorgid}
</if>
<if test="constructionunitid != null and constructionunitid != ''">
and constructionunitid = #{constructionunitid}
</if>
GROUP BY aorid
ORDER BY applicantTime desc
@ -623,6 +633,12 @@
<if test="endDate != null and endDate != ''">
and applicantTime &lt;= #{endDate}
</if>
<if test="adminorgid != null and adminorgid != ''">
and adminorgid = #{adminorgid}
</if>
<if test="constructionunitid != null and constructionunitid != ''">
and constructionunitid = #{constructionunitid}
</if>
GROUP BY aorid
order by applicantTime desc
@ -668,6 +684,12 @@
<if test="endDate != null and endDate != ''">
and applicantTime &lt;= #{endDate}
</if>
<if test="adminorgid != null and adminorgid != ''">
and adminorgid = #{adminorgid}
</if>
<if test="constructionunitid != null and constructionunitid != ''">
and constructionunitid = #{constructionunitid}
</if>
</select>
<!-- 查询所有入库记录-->
@ -882,6 +904,12 @@
<if test="istransfer != null and istransfer != ''">
and istransfer = #{istransfer}
</if>
<if test="adminorgid != null and adminorgid != ''">
and adminorgid = #{adminorgid}
</if>
<if test="constructionunitid != null and constructionunitid != ''">
and constructionunitid = #{constructionunitid}
</if>
</select>
@ -1037,7 +1065,7 @@
<!-- 插入一条出库子订单-->
<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)
insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,constructionunitid,adminorgid)
values(
#{id},
#{mid},
@ -1049,7 +1077,9 @@
#{parentId},
#{transferId},
#{trueOut},
#{unit}
#{unit},
#{constructionUnitId},
#{adminorgId}
)
</insert>
@ -1309,7 +1339,13 @@
parentId = #{parentId},
</if>
<if test="trueOut != null">
trueOut = #{trueOut}
trueOut = #{trueOut},
</if>
<if test="adminorgid != null and adminorgid != ''">
adminorgid = #{adminorgid},
</if>
<if test="constructionunitid != null and constructionunitid != ''">
constructionunitid = #{constructionunitid}
</if>
where id = #{id}

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

@ -101,6 +101,26 @@ public class ApplicationOutRecordMinP {
*/
private Integer transferId;
/**
* 施工单位id
*/
private Integer constructionUnitId;
/**
* 施工单位名称
*/
private String constructionUnitName;
/**
* 部门id
*/
private Integer adminorgId;
/**
* 部门名称
*/
private String adminorgName;
@ -116,5 +136,7 @@ public class ApplicationOutRecordMinP {
this.placeId = recordMin.getPlaceId();
this.unit = recordMin.getUnit();
this.transferId = recordMin.getTransferId();
this.constructionUnitId = recordMin.getConstructionUnitId();
this.adminorgId = recordMin.getAdminorgId();
}
}

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

@ -149,4 +149,17 @@ public class ApplicationOutRecordP {
* 出库单位
*/
private String unit;
/**
* 施工单位id
*/
private Integer constructionUnitId;
/**
* 施工单位名称
*/
private String constructionUnitName;
/**
* 部门id
*/
private Integer adminorgId;
}

4
src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java
View File

@ -373,7 +373,7 @@ public class CompanyServiceImpl implements CompanyService {
*/
public Map<String,Object> buildTree(JSONObject jsonObject,List<Object> children){
Map<String,Object> node = new HashMap<>();
node.put("id",jsonObject.getInteger("id"));
node.put("id",jsonObject.getString("id"));
node.put("title",jsonObject.getString("name"));
node.put("children",children);
node.put("wechatorganizationid",jsonObject.getInteger("wechatorganizationid"));
@ -387,7 +387,7 @@ public class CompanyServiceImpl implements CompanyService {
*/
public Map<String,Object> buildTree(ConstructionUnit constructionUnit){
Map<String,Object> node = new HashMap<>();
node.put("id",constructionUnit.getId());
node.put("id",constructionUnit.getId().toString());
node.put("title",constructionUnit.getName());
return node;
}

6
src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java
View File

@ -73,8 +73,7 @@ public class LinkInterfaceUtil {
}
JSONObject jsonObject = JSONObject.parseObject(post);
JSONObject data = (JSONObject) jsonObject.get("data");
UserByPort userByPort = JSONObject.toJavaObject(data, UserByPort.class);
return userByPort;
return JSONObject.toJavaObject(data, UserByPort.class);
}
/**
@ -98,8 +97,7 @@ public class LinkInterfaceUtil {
}
JSONObject jsonObject = JSONObject.parseObject(post);
JSONObject data = (JSONObject) jsonObject.get("data");
Administration administration = JSONObject.toJavaObject(data, Administration.class);
return administration;
return JSONObject.toJavaObject(data, Administration.class);
}
/**

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

@ -66,6 +66,16 @@
<td>转入位置</td>
<td id="location" th:text="${toLocation}">2016-11-28</td>
</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>
<td>出库人员</td>
@ -73,6 +83,7 @@
</tr>
</tbody>
</table>
</div>
</div>

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

@ -133,8 +133,8 @@
readonly
id="openCompanyAdminorg"
onclick="selectPost(this)"
lay-verify="required"/>
<input type="text" name="adminorg" class="layui-input"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgId"
style="display: none"/>
</div>
@ -146,7 +146,7 @@
readonly
id="openConstructionUnit"
onclick="selectConstructionUnit(this)"
lay-verify="required"/>
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitId"
style="display: none"/>
@ -249,8 +249,8 @@
readonly
id="openCompanyAdminorgForGroup"
onclick="selectPost(this)"
lay-verify="required"/>
<input type="text" name="adminorg" class="layui-input"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgIdForGroup"
style="display: none"/>
</div>
@ -262,7 +262,7 @@
readonly
id="openConstructionUnitForGroup"
onclick="selectConstructionUnit(this)"
lay-verify="required"/>
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitIdForGroup"
style="display: none"/>
@ -631,8 +631,8 @@
readonly
id=`+"openCompanyAdminorg"+NewIdNumber+`
onclick="selectPost(this)"
lay-verify="required"/>
<input type="text" name=`+"adminorg"+NewIdNumber+` class="layui-input"
/>
<input type="text" name=`+"adminorgId"+NewIdNumber+` class="layui-input"
id=`+"adminorgId"+NewIdNumber+`
style="display: none"/>
</div>
@ -644,7 +644,7 @@
readonly
id=`+"openConstructionUnit"+NewIdNumber+`
onclick="selectConstructionUnit(this)"
lay-verify="required"/>
/>
<input type="text" name=`+"constructionUnitId"+NewIdNumber+` class="layui-input"
id=`+"constructionUnitId"+NewIdNumber+`
style="display: none"/>
@ -718,8 +718,8 @@
readonly
id=`+"openCompanyAdminorgForGroup"+NewIdNumber+`
onclick="selectPost(this)"
lay-verify="required"/>
<input type="text" name=`+"adminorg"+NewIdNumber+` class="layui-input"
/>
<input type="text" name=`+"adminorgId"+NewIdNumber+` class="layui-input"
id=`+"adminorgIdForGroup"+NewIdNumber+`
style="display: none"/>
</div>
@ -731,7 +731,7 @@
readonly
id=`+"openConstructionUnitForGroup"+NewIdNumber+`
onclick="selectConstructionUnit(this)"
lay-verify="required"/>
/>
<input type="text" name=`+"constructionUnitId"+NewIdNumber+` class="layui-input"
id=`+"constructionUnitIdForGroup"+NewIdNumber+`
style="display: none"/>

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

@ -113,7 +113,8 @@
<result column="placeId" property="placeId" jdbcType="INTEGER"/>
<result column="pass" property="pass" jdbcType="INTEGER"/>
<result column="aormUnit" property="unit" jdbcType="VARCHAR"/>
<result column="aormconstructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
<result column="aormadminorgid" property="adminorgId" jdbcType="INTEGER"/>
</resultMap>
@ -129,6 +130,8 @@
<result column="code" property="code" jdbcType="VARCHAR"/>
<result column="transferId" property="transferId" jdbcType="INTEGER"/>
<result column="unit" property="unit" jdbcType="VARCHAR"/>
<result column="constructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
<result column="adminorgid" property="adminorgId" jdbcType="INTEGER"/>
</resultMap>
<!-- 表查询字段 -->
@ -166,11 +169,12 @@
<sql id="ApplicationOutRecordInfo">
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
depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aormconstructionunitid,aormadminorgid,cuname,
cuintroduce,cuaddress
</sql>
<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.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
</sql>
<!-- 查询所有数据行数 -->
<select id="findCount" resultType="integer">
@ -575,6 +579,12 @@
<if test="placeId != null">
and placeId = #{placeId}
</if>
<if test="adminorgid != null and adminorgid != ''">
and adminorgid = #{adminorgid}
</if>
<if test="constructionunitid != null and constructionunitid != ''">
and constructionunitid = #{constructionunitid}
</if>
GROUP BY aorid
ORDER BY applicantTime desc
@ -623,6 +633,12 @@
<if test="endDate != null and endDate != ''">
and applicantTime &lt;= #{endDate}
</if>
<if test="adminorgid != null and adminorgid != ''">
and adminorgid = #{adminorgid}
</if>
<if test="constructionunitid != null and constructionunitid != ''">
and constructionunitid = #{constructionunitid}
</if>
GROUP BY aorid
order by applicantTime desc
@ -668,6 +684,12 @@
<if test="endDate != null and endDate != ''">
and applicantTime &lt;= #{endDate}
</if>
<if test="adminorgid != null and adminorgid != ''">
and adminorgid = #{adminorgid}
</if>
<if test="constructionunitid != null and constructionunitid != ''">
and constructionunitid = #{constructionunitid}
</if>
</select>
<!-- 查询所有入库记录-->
@ -882,6 +904,12 @@
<if test="istransfer != null and istransfer != ''">
and istransfer = #{istransfer}
</if>
<if test="adminorgid != null and adminorgid != ''">
and adminorgid = #{adminorgid}
</if>
<if test="constructionunitid != null and constructionunitid != ''">
and constructionunitid = #{constructionunitid}
</if>
</select>
@ -1037,7 +1065,7 @@
<!-- 插入一条出库子订单-->
<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)
insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,constructionunitid,adminorgid)
values(
#{id},
#{mid},
@ -1049,7 +1077,9 @@
#{parentId},
#{transferId},
#{trueOut},
#{unit}
#{unit},
#{constructionUnitId},
#{adminorgId}
)
</insert>
@ -1309,7 +1339,13 @@
parentId = #{parentId},
</if>
<if test="trueOut != null">
trueOut = #{trueOut}
trueOut = #{trueOut},
</if>
<if test="adminorgid != null and adminorgid != ''">
adminorgid = #{adminorgid},
</if>
<if test="constructionunitid != null and constructionunitid != ''">
constructionunitid = #{constructionunitid}
</if>
where id = #{id}

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

@ -66,6 +66,16 @@
<td>转入位置</td>
<td id="location" th:text="${toLocation}">2016-11-28</td>
</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>
<td>出库人员</td>
@ -73,6 +83,7 @@
</tr>
</tbody>
</table>
</div>
</div>

Write Preview
Loading…
Cancel
Save