From d566827fceaaefc741afe10807bbfedf945b6da2 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 21 Sep 2022 14:09:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90pc=E7=AB=AF=E4=B8=8E=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../depository_manage/entity/Material.java | 5 + .../mapper/MaterialMapper.xml | 8 +- .../impl/DepositoryRecordServiceImpl.java | 256 ++++++++++-------- src/main/resources/application-test.yml | 4 + src/main/resources/static/css/public.css | 2 +- src/main/resources/static/images/search.png | Bin 0 -> 2789 bytes .../static/js/lay-module/step-lay/step.css | 6 +- .../static/js/lay-module/step-lay/step.js | 12 +- src/main/resources/templates/index.html | 8 +- .../pages/application/application-review.html | 13 +- .../application/application-transfer.html | 1 + .../templates/pages/application/my-apply.html | 146 +++++----- .../templates/pages/application/my-task.html | 89 +++--- .../pages/application/my-task_back.html | 32 +-- target/classes/application-test.yml | 4 + .../mapper/MaterialMapper.xml | 8 +- target/classes/static/css/public.css | 2 +- target/classes/static/images/search.png | Bin 0 -> 2789 bytes .../static/js/lay-module/step-lay/step.css | 6 +- .../static/js/lay-module/step-lay/step.js | 12 +- target/classes/templates/index.html | 8 +- .../pages/application/application-review.html | 13 +- .../application/application-transfer.html | 1 + .../templates/pages/application/my-apply.html | 146 +++++----- .../templates/pages/application/my-task.html | 89 +++--- .../pages/application/my-task_back.html | 32 +-- 27 files changed, 490 insertions(+), 414 deletions(-) create mode 100644 src/main/resources/static/images/search.png create mode 100644 target/classes/static/images/search.png diff --git a/pom.xml b/pom.xml index 467e10b3..59393199 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,7 @@ + diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Material.java b/src/main/java/com/dreamchaser/depository_manage/entity/Material.java index 72aa4810..6e082862 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Material.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Material.java @@ -61,4 +61,9 @@ public class Material { */ private String depositoryCode; + /** + * 暂存额度 + */ + private Integer numberOfTemporary; + } \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index df6af285..6911602c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -18,6 +18,7 @@ + @@ -50,7 +51,7 @@ - m.id, m.depository_id, m.mname, m.quantity, m.price, m.type_id,m.state,m.code ,m.version ,m.amounts ,m.unit ,m.texture,m.depositoryCode + m.id, m.depository_id, m.mname, m.quantity, m.price, m.type_id,m.state,m.code ,m.version ,m.amounts ,m.unit ,m.texture,m.depositoryCode,m.number_of_temporary @@ -244,7 +245,10 @@ unit = #{unit}, - depositoryCode = #{depositoryCode} + depositoryCode = #{depositoryCode}, + + + number_of_temporary = #{numberOfTemporary} WHERE id = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index ee9d7314..71a3db3c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -19,7 +19,10 @@ import com.dreamchaser.depository_manage.utils.WordUtil; import org.apache.http.protocol.HTTP; import org.springframework.beans.Mergeable; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.SessionCallback; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import cn.hutool.core.lang.Snowflake; @@ -28,6 +31,7 @@ import java.io.IOException; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; /** * @author Dreamchaser @@ -47,7 +51,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Autowired private RoleService roleService; @Autowired - private RedisTemplate redisTemplate; + private RedisTemplate redisTemplate; /** * 提交申请，插入一条仓库调度记录 @@ -72,61 +76,64 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 插入一条入库记录 + * * @param map * @return */ @Override public Integer applicationIn(Map map) { - Integer depositoryId =ObjectFormatUtil.toInteger(map.get("depositoryId")); + Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); Depository depositoryRecordById = depositoryMapper.findDepositoryRecordById(depositoryId); - Map temp = new HashMap<>(); - temp.put("dname",depositoryRecordById.getDname()); - temp.put("dcode",depositoryRecordById.getCode()); + Map temp = new HashMap<>(); + temp.put("dname", depositoryRecordById.getDname()); + temp.put("dcode", depositoryRecordById.getCode()); Double Inventory = depositoryMapper.getToDayInventoryByDName(temp); - String code = createCode(depositoryRecordById.getDname(),"InOrderNumber"); + String code = createCode(depositoryRecordById.getDname(), "InOrderNumber"); Double quantity = Double.parseDouble((String) map.get("quantity")); Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); Material material = materialMapper.findMaterialById(mid); // 判断剩余容量是否可以存入 - if(depositoryRecordById.getMaxNumber() - Inventory param = new HashMap<>(); - param.put("depositoryId",depositoryId); - param.put("mname",material.getMname()); + Map param = new HashMap<>(); + param.put("depositoryId", depositoryId); + param.put("mname", material.getMname()); List materialByCondition = materialMapper.findMaterialByCondition(param); // 计算当前入库材料金额 int amounts = (int) ((material.getPrice() / 100) * quantity * 100); map.put("price", amounts); String simpleTime = DateUtil.getSimpleTime(new Date()); - map.put("applicant_time",DateUtil.DateTimeToTimeStamp(simpleTime)); - map.put("code",code); + map.put("applicant_time", DateUtil.DateTimeToTimeStamp(simpleTime)); + map.put("code", code); // 获取当前材料 - if(materialByCondition.size() > 0){ // 如果当前存在 + if (materialByCondition.size() > 0) { // 如果当前存在 Material mt = materialByCondition.get(0); mt.setAmounts(mt.getAmounts() + amounts); mt.setQuantity((int) (mt.getQuantity() + quantity)); materialMapper.updateMaterial(mt); - }else{ - Map insert = new HashMap<>(); + } else { + Map insert = new HashMap<>(); Material materialById = materialMapper.findMaterialById(mid); - insert.put("depositoryId",depositoryId); - insert.put("price",materialById.getPrice()); - insert.put("mname",materialById.getMname()); - insert.put("quantity",quantity); - insert.put("materialTypeId",materialById.getTypeId()); - insert.put("code",materialById.getCode()); - insert.put("unit",materialById.getUnit()); - insert.put("version",materialById.getVersion()); - insert.put("texture",materialById.getTexture()); - insert.put("amounts",quantity * materialById.getPrice()); - insert.put("depositoryCode",materialById.getDepositoryCode()); + insert.put("depositoryId", depositoryId); + insert.put("price", materialById.getPrice()); + insert.put("mname", materialById.getMname()); + insert.put("quantity", quantity); + insert.put("materialTypeId", materialById.getTypeId()); + insert.put("code", materialById.getCode()); + insert.put("unit", materialById.getUnit()); + insert.put("version", materialById.getVersion()); + insert.put("texture", materialById.getTexture()); + insert.put("amounts", quantity * materialById.getPrice()); + insert.put("depositoryCode", materialById.getDepositoryCode()); materialMapper.insertMaterial(insert); } return depositoryRecordMapper.insertApplicationInRecord(map); } + /** * 插入一条出库记录 + * * @param map * @return */ @@ -134,19 +141,23 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public Integer insertApplicationOutRecord(Map map) { Double quantity = Double.parseDouble((String) map.get("quantity")); Long time = DateUtil.DateTimeToTimeStamp(DateUtil.getSimpleTime(new Date())); - map.put("applicantTime",time); + map.put("applicantTime", time); Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); // 获取当前材料 Material materialById = materialMapper.findMaterialById(mid); int amounts = (int) ((materialById.getPrice() / 100) * quantity * 100); map.put("price", amounts); String simpleTime = DateUtil.getSimpleTime(new Date()); - map.put("depositoryId",materialById.getDepositoryId()); - map.put("state","待部门负责人审核"); - map.put("istransfer",2); + map.put("depositoryId", materialById.getDepositoryId()); + map.put("state", "待部门负责人审核"); + map.put("istransfer", 2); + Map update = new HashMap<>(); + update.put("id", materialById.getId()); + update.put("numberOfTemporary", materialById.getNumberOfTemporary() + quantity); + materialMapper.updateMaterial(update); Depository depositoryRecordById = depositoryMapper.findDepositoryRecordById(materialById.getDepositoryId()); - String code = createCode(depositoryRecordById.getDname(),"outOrderNumber"); - map.put("code",code); + String code = createCode(depositoryRecordById.getDname(), "outOrderNumber"); + map.put("code", code); return depositoryRecordMapper.insertApplicationOutRecord(map); } @@ -162,6 +173,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 计算购入材料总数 + * * @return */ @Override @@ -169,13 +181,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List applicationInRecordPAll = depositoryRecordMapper.findApplicationInRecordPAll(); Double sum = 0.0; for (int i = 0; i < applicationInRecordPAll.size(); i++) { - sum += (double)applicationInRecordPAll.get(i).getQuantity(); + sum += (double) applicationInRecordPAll.get(i).getQuantity(); } return sum; } /** * 计算出库材料总数 + * * @param state * @return */ @@ -185,13 +198,13 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Double sum = 0.0; if (state.isEmpty()) { for (int i = 0; i < applicationOutRecordPAll.size(); i++) { - sum += (double) applicationOutRecordPAll.get(i).getQuantity(); + sum += (double) applicationOutRecordPAll.get(i).getQuantity(); } } else { for (int i = 0; i < applicationOutRecordPAll.size(); i++) { - if ( state.equals(applicationOutRecordPAll.get(i).getState())) { - sum += (double)applicationOutRecordPAll.get(i).getQuantity(); + if (state.equals(applicationOutRecordPAll.get(i).getState())) { + sum += (double) applicationOutRecordPAll.get(i).getQuantity(); } } } @@ -210,21 +223,21 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); Double quantity = Double.parseDouble((String) map.get("quantity")); Material material = materialMapper.findMaterialById(mid); - map.put("depositoryId",material.getDepositoryId()); + map.put("depositoryId", material.getDepositoryId()); map.put("mid", mid); map.put("state", "待部门负责人审核"); String simpleTime = DateUtil.getSimpleTime(new Date()); map.put("applicantTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("price", material.getPrice() * quantity * 100); - map.put("istransfer",1); + map.put("istransfer", 1); map.put("fromId", material.getDepositoryId()); //清除主键 // depositoryRecordMapper.insertApplicationInRecord(map); transferRecordMapper.addTransferRecord(map); TransferRecord transferRecordByCondition = transferRecordMapper.findTransferRecordByCondition(map).get(0); - map.put("transferId",transferRecordByCondition.getId()); + map.put("transferId", transferRecordByCondition.getId()); Depository depositoryRecordById = depositoryMapper.findDepositoryRecordById(material.getDepositoryId()); - map.put("code",createCode(depositoryRecordById.getDname(),"outOrderNumber")); + map.put("code", createCode(depositoryRecordById.getDname(), "outOrderNumber")); //清除主键 return depositoryRecordMapper.insertApplicationOutRecord(map); } @@ -252,12 +265,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { UserByPort userByPort = PageController.FindUserById(userIdByDidList.get(i)); depositoryManager += userByPort.getId().toString() + ","; } - map.put("depositoryManager",depositoryManager); + map.put("depositoryManager", depositoryManager); } else { map.put("state", "部门负责人审核未通过"); } - } - else { + } else { String simpleTime = DateUtil.getSimpleTime(new Date()); map.put("depositoryManagerTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("depositoryManager", userid); @@ -266,25 +278,30 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Material material = materialMapper.findMaterialById(record.getMid()); Integer depositoryManagerPass = (Integer) map.get("depositoryManagerPass"); if (depositoryManagerPass == 1) { - if (material.getQuantity() >= record.getQuantity()) { - // 当前出库金额 - Double sum = material.getPrice() * record.getQuantity(); - material.setAmounts(material.getAmounts() - sum); - material.setQuantity(material.getQuantity() - record.getQuantity()); - materialMapper.updateMaterial(material); - if(record.getIstransfer() == 1){ - map.put("quantity",record.getQuantity().toString()); - map.put("applicantId",record.getApplicantId()); - map.put("transferId",record.getTransferId()); - transferMaterial(map); - } - } else { - map.put("state","未出库"); - map.put("depositoryManagerMessage","当前仓位库存量不足"); - depositoryRecordMapper.updateApplicationOutRecord(map); - return -1; + if (material.getQuantity() >= record.getQuantity()) { + // 当前出库金额 + Double sum = material.getPrice() * record.getQuantity(); + material.setAmounts(material.getAmounts() - sum); + material.setQuantity(material.getQuantity() - record.getQuantity()); + material.setNumberOfTemporary(material.getNumberOfTemporary() - record.getQuantity()); + materialMapper.updateMaterial(material); + if (record.getIstransfer() == 1) { + map.put("quantity", record.getQuantity().toString()); + map.put("applicantId", record.getApplicantId()); + map.put("transferId", record.getTransferId()); + transferMaterial(map); } - map.put("state", "已出库"); + } else { + map.put("state", "未出库"); + map.put("depositoryManagerMessage", "当前仓位库存量不足"); + Map update = new HashMap<>(); + update.put("id", material.getId()); + update.put("numberOfTemporary", 0); + materialMapper.updateMaterial(update); + depositoryRecordMapper.updateApplicationOutRecord(map); + return -1; + } + map.put("state", "已出库"); } else { map.put("state", "仓库管理员审核未通过"); } @@ -294,36 +311,37 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 转移物品 + * * @param map */ - public void transferMaterial(Map map){ - Map param = new HashMap<>(); + public void transferMaterial(Map map) { + Map param = new HashMap<>(); Integer transferId = ObjectFormatUtil.toInteger(map.get("transferId")); TransferRecord transferRecor = transferRecordMapper.findTransferRecordById(transferId); - Integer mid = transferRecor.getMid(); + Integer mid = transferRecor.getMid(); Material material = materialMapper.findMaterialById(mid); - param.put("mname",material.getMname()); - param.put("depositoryId",transferRecor.getToId()); + param.put("mname", material.getMname()); + param.put("depositoryId", transferRecor.getToId()); List materiallist = materialMapper.findMaterialByCondition(param); - if(materiallist.size() > 0){ - map.put("depositoryId",transferRecor.getToId()); + if (materiallist.size() > 0) { + map.put("depositoryId", transferRecor.getToId()); applicationIn(map); - map.put("mid",materiallist.get(0).getId()); - }else{ - Map insert = new HashMap<>(); + map.put("mid", materiallist.get(0).getId()); + } else { + Map insert = new HashMap<>(); Material materialById = materialMapper.findMaterialById(mid); Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); - insert.put("depositoryId",transferRecor.getToId()); - insert.put("price",materialById.getPrice()); - insert.put("mname",materialById.getMname()); - insert.put("quantity",quantity); - insert.put("materialTypeId",materialById.getTypeId()); - insert.put("code",materialById.getCode()); - insert.put("unit",materialById.getUnit()); - insert.put("version",materialById.getVersion()); - insert.put("texture",materialById.getTexture()); - insert.put("amounts",quantity * materialById.getPrice()); - insert.put("depositoryCode",materialById.getDepositoryCode()); + insert.put("depositoryId", transferRecor.getToId()); + insert.put("price", materialById.getPrice()); + insert.put("mname", materialById.getMname()); + insert.put("quantity", quantity); + insert.put("materialTypeId", materialById.getTypeId()); + insert.put("code", materialById.getCode()); + insert.put("unit", materialById.getUnit()); + insert.put("version", materialById.getVersion()); + insert.put("texture", materialById.getTexture()); + insert.put("amounts", quantity * materialById.getPrice()); + insert.put("depositoryCode", materialById.getDepositoryCode()); materialMapper.insertMaterial(insert); } } @@ -388,6 +406,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 根据条件查询入库记录，同时支持分页查询 + * * @param map * @return */ @@ -402,9 +421,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { page = ObjectFormatUtil.toInteger(map.get("page")); map.put("begin", (page - 1) * size); } - if(map.containsKey("applyTime")){ + if (map.containsKey("applyTime")) { String applyTime = (String) map.get("applyTime"); - map.put("applicantTime",DateUtil.DateTimeByMonthToTimeStamp(applyTime)); + map.put("applicantTime", DateUtil.DateTimeByMonthToTimeStamp(applyTime)); } List list = depositoryRecordMapper.findApplicationInRecordPByCondition(map); for (int i = 0; i < list.size(); i++) { @@ -412,12 +431,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { String time = DateUtil.TimeStampToDateTime(Long.valueOf(list.get(i).getApplicantTime())); list.get(i).setApplicantName(userByPortById.getName()); list.get(i).setApplicantTime(time); - list.get(i).setApplyRemark(list.get(i).getApplyRemark() == null?"":list.get(i).getApplyRemark()); + list.get(i).setApplyRemark(list.get(i).getApplyRemark() == null ? "" : list.get(i).getApplyRemark()); } return list; } + /** * 根据条件查询出库记录，同时支持分页查询 + * * @param map * @return */ @@ -432,9 +453,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { page = ObjectFormatUtil.toInteger(map.get("page")); map.put("begin", (page - 1) * size); } - if(map.containsKey("applyTime")){ + if (map.containsKey("applyTime")) { String applyTime = (String) map.get("applyTime"); - map.put("applicantTime",DateUtil.DateTimeByMonthToTimeStamp(applyTime)); + map.put("applicantTime", DateUtil.DateTimeByMonthToTimeStamp(applyTime)); } List list = depositoryRecordMapper.findApplicationOutRecordPByCondition(map); for (int i = 0; i < list.size(); i++) { @@ -442,13 +463,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { String time = DateUtil.TimeStampToDateTime(Long.valueOf(list.get(i).getApplicantTime())); list.get(i).setApplicantName(userByPortById.getName()); list.get(i).setApplicantTime(time); - list.get(i).setApplyRemark(list.get(i).getApplyRemark() == null?"":list.get(i).getApplyRemark()); + list.get(i).setApplyRemark(list.get(i).getApplyRemark() == null ? "" : list.get(i).getApplyRemark()); } return list; } /** * 根据条件查询出库记录数目 + * * @param map * @return */ @@ -459,6 +481,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 根据id查询出库记录 + * * @param id * @return */ @@ -469,6 +492,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 根据条件查询入库记录数目 + * * @param map * @return */ @@ -539,6 +563,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public Integer findMyTaskCount(Map map) { return depositoryRecordMapper.findMyTaskCount(map); } + /** * 返回该我的任务数（完成或者未完成） * @@ -571,19 +596,19 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Double sum = 0.0; if (state.isEmpty()) { for (int i = 0; i < depositoryRecordAll.size(); i++) { - if (Integer.compare(depositoryRecordAll.get(i).getType(),type) == 0) { + if (Integer.compare(depositoryRecordAll.get(i).getType(), type) == 0) { sum += depositoryRecordAll.get(i).getQuantity(); } } } else { for (int i = 0; i < depositoryRecordAll.size(); i++) { - if (Integer.compare(depositoryRecordAll.get(i).getType(),type) == 0 && state.equals(depositoryRecordAll.get(i).getState())) { + if (Integer.compare(depositoryRecordAll.get(i).getType(), type) == 0 && state.equals(depositoryRecordAll.get(i).getState())) { sum += depositoryRecordAll.get(i).getQuantity(); } } } BigDecimal bg = new BigDecimal(sum); - sum = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + sum = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); return sum; } @@ -599,24 +624,25 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Double sum = 0.0; if (state.isEmpty()) { for (int i = 0; i < depositoryRecordAll.size(); i++) { - if (Integer.compare(depositoryRecordAll.get(i).getType(),type) == 0) { + if (Integer.compare(depositoryRecordAll.get(i).getType(), type) == 0) { sum += (depositoryRecordAll.get(i).getPrice() / 100); } } } else { for (int i = 0; i < depositoryRecordAll.size(); i++) { - if (Integer.compare(depositoryRecordAll.get(i).getType(),type) == 0 && state.equals(depositoryRecordAll.get(i).getState())) { + if (Integer.compare(depositoryRecordAll.get(i).getType(), type) == 0 && state.equals(depositoryRecordAll.get(i).getState())) { sum += (depositoryRecordAll.get(i).getPrice() / 100); } } } BigDecimal bg = new BigDecimal(sum); - sum = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + sum = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); return sum; } /** * 计算入库材料总额 + * * @return */ @Override @@ -625,15 +651,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Double sum = 0.0; for (int i = 0; i < applicationInRecordPAll.size(); i++) { double price = applicationInRecordPAll.get(i).getPrice(); - sum += price/100; + sum += price / 100; } BigDecimal bg = new BigDecimal(sum); - sum = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + sum = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); return sum; } /** * 计算出库材料总额 + * * @param state * @return */ @@ -644,19 +671,19 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (state.isEmpty()) { for (int i = 0; i < applicationOutRecordPAll.size(); i++) { Double price = applicationOutRecordPAll.get(i).getPrice(); - sum += (double)( price/ 100); + sum += (double) (price / 100); } } else { for (int i = 0; i < applicationOutRecordPAll.size(); i++) { - if ( state.equals(applicationOutRecordPAll.get(i).getState())) { + if (state.equals(applicationOutRecordPAll.get(i).getState())) { Double price = applicationOutRecordPAll.get(i).getPrice(); - sum += (double)( price/ 100); + sum += (double) (price / 100); } } } BigDecimal bg = new BigDecimal(sum); - sum = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + sum = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); return sum; } @@ -701,7 +728,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("depositoryId", depositoryId); if (type == 1) { return depositoryRecordMapper.findApplicationInRecordByDate(map); - } else{ + } else { map.put("state", "已出库"); return depositoryRecordMapper.findApplicationOutRecordByDate(map); } @@ -763,10 +790,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Override public Double findMaterialCountByMonth1(Map map) { Integer type = ObjectFormatUtil.toInteger(map.get("type")); - if(type == 1){ + if (type == 1) { // 如果入库 return depositoryRecordMapper.findApplicationInByMonth(map); - }else{ + } else { // 如果出库 return depositoryRecordMapper.findApplicationOutByMonth(map); } @@ -784,6 +811,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 根据id查询入库记录 + * * @param id * @return */ @@ -794,8 +822,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 根据id删除入库记录 - * @return 受影响的行数 + * * @param id + * @return 受影响的行数 */ @Override public Integer deleteApplicationInRecordById(Integer id) { @@ -804,6 +833,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 根据id集合删除多条入库记录 + * * @param list id集合 * @return 受影响的行数 */ @@ -813,7 +843,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } - /** * 对查出来的记录进行包装，包装成前端需要的数据 * @@ -842,7 +871,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (SimpleApplicationOutRecord record : list) { SimpleApplicationOutRecordP d = new SimpleApplicationOutRecordP(record); UserByPort userByPort = findUserByPortById(record.getApplicantId()); - d.setApplyRemark(d.getApplyRemark() == null?"":d.getApplyRemark()); + d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark()); d.setApplicantName(userByPort.getName()); result.add(d); } @@ -881,11 +910,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { /** * 根据id获取对应用户 + * * @param id * @return */ private UserByPort findUserByPortById(Integer id) { - String url = PortConfig.external_url + "/staff/archivescont"; + String url = PortConfig.external_url + "/staff/archivescont"; Map map = new HashMap<>(); map.put("id", id); String jsonString = JSONObject.toJSONString(map); @@ -898,27 +928,29 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); - UserByPort userByPort = JSONObject.toJavaObject( data, UserByPort.class); + UserByPort userByPort = JSONObject.toJavaObject(data, UserByPort.class); return userByPort; } /** * 生成单号 + * * @param depositoryName * @return */ - private String createCode(String depositoryName,String key){ + private String createCode(String depositoryName, String key) { + // 单号（公司简称+仓库简称+年月日+数字（位数设置>=9）） String code = "GK"; String nowTime = DateUtil.getNowTime(); depositoryName = WordUtil.getPinYinHeadChar(depositoryName); String orderNumber = redisTemplate.opsForValue().get(key); - if(orderNumber == null){ - redisTemplate.opsForValue().set(key,"1",DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS); + if (orderNumber == null) { + redisTemplate.opsForValue().set(key, "1", DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS); orderNumber = "1"; } int newNumber = ObjectFormatUtil.toInteger(orderNumber) + 1; - redisTemplate.boundValueOps(key).set(String.valueOf(newNumber),DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS); + redisTemplate.boundValueOps(key).set(String.valueOf(newNumber), DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS); orderNumber = String.format("%09d", ObjectFormatUtil.toInteger(orderNumber)); code = code + depositoryName + nowTime + orderNumber; return code; diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 1e0cac29..a5890e7f 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -80,6 +80,10 @@ spring: min-idle: 0 timeout: 2000ms + + + + # resources: # static-locations: classpath:/static/ server: diff --git a/src/main/resources/static/css/public.css b/src/main/resources/static/css/public.css index a4136318..86788353 100644 --- a/src/main/resources/static/css/public.css +++ b/src/main/resources/static/css/public.css @@ -82,7 +82,7 @@ body { } .my-time{ - margin-top: 20px; + margin-top: 40px; margin-bottom: 20px; } body{ diff --git a/src/main/resources/static/images/search.png b/src/main/resources/static/images/search.png new file mode 100644 index 0000000000000000000000000000000000000000..1cecb95fc2d6010a27e86f39c38553e714edb541 GIT binary patch literal 2789 zcmdUx`BPI_7RQsvBP5X}3A<4UG03KZ=!haq5_WJP9YB;dt&v4m0ojq4h=3vx6&j)0 z6l_3N*#ty=gN;OG6D0yJq)|khAh8iaL78XO)cgVSOV|8x@40pA-a1w1dp_sfvn*E! z1^h-l3WZW|aT!6s0$}GaLB5oU{f>NeMLe6O1Q=$~l?jQ72)~TQO{O_5unNn>~C zUjYrKcHTjUomC98#0}_3u~9^6wIkC8%VwU^PH^I~LY*qM@CM-pbFEvSnu8hs;2I{O zf3(z+4%{QGm_?aNQ*6HkGpwvvnOYYHH$yuRPUS+L}988_UxXBik?3h!OI zL}3lxSmcp|+&Hlz-OHXdXMqpT?WE({J4wXX3yS?oS)hp891?f5`O)@t8@Mag#2&}~ z5M0(pb4<()yj}Rf>ULL0IFJm@Z}v_hOEVSw8xkGUDM2!Rjo3mUehhQ66ckaUwC102 zMVsNl_D@uBLN zC3q7MiPrLGR<9*^o*KCR)fW4grMS{1F3l{e+3-p>t@$#%i=N0o`f64ie&0^m0vZg@ z+)ZIoukERxqnYHvEdd0}4LzM|0qKboy8nyI>Wwi;q3%Y-|;i9DAEJKn;M=n8+N5L zTHJ&wl_Zwnr;oQ1;{g1{ROVZ90mMIlZfdYqnI(`Yn@-h$DqN4Xh_X_M&n*{xvDdAj zR8Ge)N9f#cLj6Wy3q5&lPfK5kV5`bq94;3gQ%|ThCWxEIw zCn>J61cfvLSP*`r4B|g+jhO+l`a&=xEPDx5sVXZq(xcNETTQq=^@uo265oCQYv>F7 zo(xY00XSP ziF z&}a$wucpT~fNF#lLew&UJ>Zpvw9A`MsyJlY+)ae8;iKuI&@AaQXIYj+A299X8l-?z?P)&HQgf z{tGZA&FLvm(-Y!kcJurVH=_=X;nudXjY6Mrr&ngD9`e*A}*bAI<_7b|_k^3%lJ?OZnpjk)L0@3@rGOruCa|?5UZfNr4|D z(WNHe_+7QkuxK=!#8q#;Ws~K=3y1$ZRdM5TVeg?JOcC-Vww^LC;quF6)ZGQLDO+%Hre$I{Gc~5mA4tXK8!t>r+{G)C z!3^h@WXOlwd)Nk01(^$73ObJO-yf;4sGM;C>S)q%aj{S#lT^jEQ0kP~yT!D*oo12= z55l>@<~DeC%N@-4#O%Se*n6VTT=DfSxD zq!H}tj9!*^jU7^r(;o8%=OKRjl{Qv3QjLAJlkOU5S)5JC6*UBdZ1?tR69j{dQRa38 n1GVboZa*U!$X`3-O_OTN8U~F2QR_oR{;en{J6GFACWrrT8ac0Y literal 0 HcmV?d00001 diff --git a/src/main/resources/static/js/lay-module/step-lay/step.css b/src/main/resources/static/js/lay-module/step-lay/step.css index 9f69fa48..14700382 100644 --- a/src/main/resources/static/js/lay-module/step-lay/step.css +++ b/src/main/resources/static/js/lay-module/step-lay/step.css @@ -3,6 +3,7 @@ width: 400px; margin: 0 auto; max-width: 100%; + text-align: center; } .step-item { @@ -54,8 +55,9 @@ .step-item-main { display: block; position: relative; - margin-left: -50%; - margin-right: 50%; + /*margin-left: -20px;*/ + /*margin-left: -50%;*/ + /*margin-right: 50%;*/ padding-left: 26px; text-align: center; } diff --git a/src/main/resources/static/js/lay-module/step-lay/step.js b/src/main/resources/static/js/lay-module/step-lay/step.js index 82eee8be..a07c8ff5 100644 --- a/src/main/resources/static/js/lay-module/step-lay/step.js +++ b/src/main/resources/static/js/lay-module/step-lay/step.js @@ -4,21 +4,24 @@ var carousel = layui.carousel; // 添加步骤条dom节点 - var renderDom = function (elem, stepItems, position) { + var renderDom = function (elem, stepItems, position,newnumber) { var stepDiv = '
'; for (var i = 0; i < stepItems.length; i++) { stepDiv += '
'; // 线 if (i < (stepItems.length - 1)) { if (i < position) { - stepDiv += '
'; + stepDiv += ''; } else { - stepDiv += '
'; + stepDiv += ''; } } // 数字 var number = stepItems[i].number; + if(newnumber != 0){ + number = newnumber; + } if (!number) { number = i + 1; } @@ -60,6 +63,7 @@ param.indicator = 'none'; // 不显示指示器 param.arrow = 'always'; // 始终显示箭头 param.autoplay = false; // 关闭自动播放 + if (!param.stepWidth) { param.stepWidth = '400px'; } @@ -69,7 +73,7 @@ // 渲染步骤条 var stepItems = param.stepItems; - renderDom(param.elem, stepItems, param.position||0); + renderDom(param.elem, stepItems, param.position||0,param.number); $('.lay-step').css('width', param.stepWidth); //监听轮播切换事件 diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index ab4417a1..f7aba988 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -51,6 +51,10 @@
    + +
  • + +
    • @@ -151,9 +155,11 @@ }; options.iniUrl= "/index/menus?uid="+uid // 初始化接口 miniAdmin.render(options); - console.log(options) + /*$("#scan").on("click",function () { + alert("扫一扫") + });*/ // 百度统计代码，只统计指定域名 diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html index db7f5a85..9681f867 100644 --- a/src/main/resources/templates/pages/application/application-review.html +++ b/src/main/resources/templates/pages/application/application-review.html @@ -156,13 +156,15 @@ var state=$("#state").text(); //当前处于的状态 - var position=0,states={}; + var position=0,states={},number = 1; if (state === "待部门负责人审核" || state === "部门负责人审核未通过") { - position = 1; - states = [{title: "提交申请"}, {title: state}, {title: "未入库"}]; + // , {title: "未入库"} + states = [ {title: state}]; + number = 2; } else { - position = 2; - states = [{title: "提交申请"}, {title: "审核通过"}, {title: state}]; + // {title: "提交申请"}, + states = [ {title: state}]; + number = 3; } step.render({ elem: '#stepForm', @@ -171,6 +173,7 @@ stepWidth: '750px', height: '650px', position: position, + number:number, stepItems: states }); diff --git a/src/main/resources/templates/pages/application/application-transfer.html b/src/main/resources/templates/pages/application/application-transfer.html index 06736514..10267d00 100644 --- a/src/main/resources/templates/pages/application/application-transfer.html +++ b/src/main/resources/templates/pages/application/application-transfer.html @@ -203,6 +203,7 @@ $('.next').click(function () { step.next('#stepForm'); + }); // 实现卡片添加 diff --git a/src/main/resources/templates/pages/application/my-apply.html b/src/main/resources/templates/pages/application/my-apply.html index 5d65c981..e8d2acc9 100644 --- a/src/main/resources/templates/pages/application/my-apply.html +++ b/src/main/resources/templates/pages/application/my-apply.html @@ -10,28 +10,26 @@ +
    入库记录 - - - - - - - - -
    +
      出库申请 - - - - - - - - -
      +
        @@ -39,44 +37,46 @@ diff --git a/src/main/resources/templates/pages/application/my-task.html b/src/main/resources/templates/pages/application/my-task.html index 8b363a37..cbb45278 100644 --- a/src/main/resources/templates/pages/application/my-task.html +++ b/src/main/resources/templates/pages/application/my-task.html @@ -10,36 +10,31 @@ + +
        未完成任务
        - - - - - - - - - -
        +
          已完成任务
          - - - - - - - - - -
          +
            @@ -56,10 +51,11 @@ //先声明 function openDetail2(data) { }; - layui.use(['flow', 'layer', 'flow', 'util'], function () { + layui.use(['flow', 'layer', 'table', 'util'], function () { var $ = layui.jquery, layer = layui.layer, flow = layui.flow, + table = layui.table, util = layui.util; //每页的数量 var size=8; @@ -72,26 +68,21 @@ let lis = []; let result; $.get('/depositoryRecord/myTask?page='+page+'&size='+size+'&isDone=0', function(res){ + var Width = "25%"; result=res.data; - console.log(res) + lis.push("
            ") for (let i=0;i'); + if(isMobile()){ + Width = "50%"; } - lis.push('

            ' +result[i].applicantName+'的') lis.push('出库请求

            '); - lis.push('
            '+result[i].applyRemark - +'
            ' - +result[i].applicantTime+'
            '); - if (i%4===3){ - lis.push(''); - } - } - if (result.length%4!==0){ - lis.push(''); + lis.push('
            ' + +result[i].applicantTime+'
            '); } + lis.push('
            '); pre1+=result.length; //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页 //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多 @@ -107,29 +98,25 @@ let lis = []; let result; $.get('/depositoryRecord/myTask?page='+page+'&size='+size+'&isDone=1', function(res){ + var Width = "25%"; result=res.data; + lis.push("
            ") for (let i=0;i'); + if(isMobile()){ + Width = "50%"; } - lis.push('

            ' + lis.push('

          • ' +result[i].applicantName+'的') if (result[i].type===1){ lis.push('入库请求

            '); }else { lis.push('出库请求

            • '); } - lis.push('
            '+result[i].applyRemark - +'
            ' - +result[i].applicantTime+'
            '); - if (i%4===3){ - lis.push(''); - } - } - if (result.length%4!==0){ - lis.push(''); + lis.push('
            ' + +result[i].applicantTime+'
            '); } + lis.push("
          ") pre2+=result.length; //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页 //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多 @@ -174,6 +161,14 @@ }); } + //定义一个函数判断是手机端还是pc端 + function isMobile(){ + if(window.navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) { + return true; // 移动端 + }else{ + return false; // PC端 + } + } }); \ No newline at end of file diff --git a/src/main/resources/templates/pages/application/my-task_back.html b/src/main/resources/templates/pages/application/my-task_back.html index fc62fa78..429f27ee 100644 --- a/src/main/resources/templates/pages/application/my-task_back.html +++ b/src/main/resources/templates/pages/application/my-task_back.html @@ -30,15 +30,8 @@
          已完成任务
          - - - - - - - - +
          @@ -58,10 +51,11 @@ //先声明 function openDetail2(data) { }; - layui.use(['flow', 'layer', 'flow', 'util'], function () { + layui.use(['flow', 'layer', 'table', 'util'], function () { var $ = layui.jquery, layer = layui.layer, flow = layui.flow, + table = layui.table, util = layui.util; //每页的数量 var size=8; @@ -77,19 +71,15 @@ result=res.data; for (let i=0;i'); + lis.push(''); } - lis.push('

          ' +result[i].applicantName+'的') - if (result[i].type===1){ - lis.push('入库请求

          '); - }else { - lis.push('出库请求
          '); - } + lis.push('出库请求
          '); lis.push('
          '+result[i].applyRemark +'
          ' - +result[i].applyTime+'
          '); + +result[i].applicantTime+''); if (i%4===3){ lis.push(''); } @@ -115,10 +105,10 @@ result=res.data; for (let i=0;i'); + lis.push(''); } lis.push('

          ' + +result[i].id+')" >

          ' +result[i].applicantName+'的') if (result[i].type===1){ lis.push('入库请求

          '); @@ -127,7 +117,7 @@ } lis.push('
          '+result[i].applyRemark +'
          ' - +result[i].applyTime+'

          '); + +result[i].applicantTime+'
          '); if (i%4===3){ lis.push(''); } @@ -169,7 +159,7 @@ maxmin: true, shadeClose: true, area: ['100%', '100%'], - content: '/form_step_look?id='+item, + content: '/ApplicationOutView?id='+item, end:function () { location.reload() } diff --git a/target/classes/application-test.yml b/target/classes/application-test.yml index 1e0cac29..a5890e7f 100644 --- a/target/classes/application-test.yml +++ b/target/classes/application-test.yml @@ -80,6 +80,10 @@ spring: min-idle: 0 timeout: 2000ms + + + + # resources: # static-locations: classpath:/static/ server: diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index df6af285..6911602c 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -18,6 +18,7 @@ + @@ -50,7 +51,7 @@ - m.id, m.depository_id, m.mname, m.quantity, m.price, m.type_id,m.state,m.code ,m.version ,m.amounts ,m.unit ,m.texture,m.depositoryCode + m.id, m.depository_id, m.mname, m.quantity, m.price, m.type_id,m.state,m.code ,m.version ,m.amounts ,m.unit ,m.texture,m.depositoryCode,m.number_of_temporary @@ -244,7 +245,10 @@ unit = #{unit},           - depositoryCode = #{depositoryCode} + depositoryCode = #{depositoryCode}, + + + number_of_temporary = #{numberOfTemporary} WHERE id = #{id} diff --git a/target/classes/static/css/public.css b/target/classes/static/css/public.css index a4136318..86788353 100644 --- a/target/classes/static/css/public.css +++ b/target/classes/static/css/public.css @@ -82,7 +82,7 @@ body { } .my-time{ - margin-top: 20px; + margin-top: 40px; margin-bottom: 20px; } body{ diff --git a/target/classes/static/images/search.png b/target/classes/static/images/search.png new file mode 100644 index 0000000000000000000000000000000000000000..1cecb95fc2d6010a27e86f39c38553e714edb541 GIT binary patch literal 2789 zcmdUx`BPI_7RQsvBP5X}3A<4UG03KZ=!haq5_WJP9YB;dt&v4m0ojq4h=3vx6&j)0 z6l_3N*#ty=gN;OG6D0yJq)|khAh8iaL78XO)cgVSOV|8x@40pA-a1w1dp_sfvn*E! z1^h-l3WZW|aT!6s0$}GaLB5oU{f>NeMLe6O1Q=$~l?jQ72)~TQO{O_5unNn>~C zUjYrKcHTjUomC98#0}_3u~9^6wIkC8%VwU^PH^I~LY*qM@CM-pbFEvSnu8hs;2I{O zf3(z+4%{QGm_?aNQ*6HkGpwvvnOYYHH$yuRPUS+L}988_UxXBik?3h!OI zL}3lxSmcp|+&Hlz-OHXdXMqpT?WE({J4wXX3yS?oS)hp891?f5`O)@t8@Mag#2&}~ z5M0(pb4<()yj}Rf>ULL0IFJm@Z}v_hOEVSw8xkGUDM2!Rjo3mUehhQ66ckaUwC102 zMVsNl_D@uBLN zC3q7MiPrLGR<9*^o*KCR)fW4grMS{1F3l{e+3-p>t@$#%i=N0o`f64ie&0^m0vZg@ z+)ZIoukERxqnYHvEdd0}4LzM|0qKboy8nyI>Wwi;q3%Y-|;i9DAEJKn;M=n8+N5L zTHJ&wl_Zwnr;oQ1;{g1{ROVZ90mMIlZfdYqnI(`Yn@-h$DqN4Xh_X_M&n*{xvDdAj zR8Ge)N9f#cLj6Wy3q5&lPfK5kV5`bq94;3gQ%|ThCWxEIw zCn>J61cfvLSP*`r4B|g+jhO+l`a&=xEPDx5sVXZq(xcNETTQq=^@uo265oCQYv>F7 zo(xY00XSP ziF z&}a$wucpT~fNF#lLew&UJ>Zpvw9A`MsyJlY+)ae8;iKuI&@AaQXIYj+A299X8l-?z?P)&HQgf z{tGZA&FLvm(-Y!kcJurVH=_=X;nudXjY6Mrr&ngD9`e*A}*bAI<_7b|_k^3%lJ?OZnpjk)L0@3@rGOruCa|?5UZfNr4|D z(WNHe_+7QkuxK=!#8q#;Ws~K=3y1$ZRdM5TVeg?JOcC-Vww^LC;quF6)ZGQLDO+%Hre$I{Gc~5mA4tXK8!t>r+{G)C z!3^h@WXOlwd)Nk01(^$73ObJO-yf;4sGM;C>S)q%aj{S#lT^jEQ0kP~yT!D*oo12= z55l>@<~DeC%N@-4#O%Se*n6VTT=DfSxD zq!H}tj9!*^jU7^r(;o8%=OKRjl{Qv3QjLAJlkOU5S)5JC6*UBdZ1?tR69j{dQRa38 n1GVboZa*U!$X`3-O_OTN8U~F2QR_oR{;en{J6GFACWrrT8ac0Y literal 0 HcmV?d00001 diff --git a/target/classes/static/js/lay-module/step-lay/step.css b/target/classes/static/js/lay-module/step-lay/step.css index 9f69fa48..14700382 100644 --- a/target/classes/static/js/lay-module/step-lay/step.css +++ b/target/classes/static/js/lay-module/step-lay/step.css @@ -3,6 +3,7 @@ width: 400px; margin: 0 auto; max-width: 100%; + text-align: center; } .step-item { @@ -54,8 +55,9 @@ .step-item-main { display: block; position: relative; - margin-left: -50%; - margin-right: 50%; + /*margin-left: -20px;*/ + /*margin-left: -50%;*/ + /*margin-right: 50%;*/ padding-left: 26px; text-align: center; } diff --git a/target/classes/static/js/lay-module/step-lay/step.js b/target/classes/static/js/lay-module/step-lay/step.js index 82eee8be..a07c8ff5 100644 --- a/target/classes/static/js/lay-module/step-lay/step.js +++ b/target/classes/static/js/lay-module/step-lay/step.js @@ -4,21 +4,24 @@ var carousel = layui.carousel; // 添加步骤条dom节点 - var renderDom = function (elem, stepItems, position) { + var renderDom = function (elem, stepItems, position,newnumber) { var stepDiv = '
          '; for (var i = 0; i < stepItems.length; i++) { stepDiv += '
          '; // 线 if (i < (stepItems.length - 1)) { if (i < position) { - stepDiv += '
          '; + stepDiv += ''; } else { - stepDiv += '
          '; + stepDiv += ''; } } // 数字 var number = stepItems[i].number; + if(newnumber != 0){ + number = newnumber; + } if (!number) { number = i + 1; } @@ -60,6 +63,7 @@ param.indicator = 'none'; // 不显示指示器 param.arrow = 'always'; // 始终显示箭头 param.autoplay = false; // 关闭自动播放 + if (!param.stepWidth) { param.stepWidth = '400px'; } @@ -69,7 +73,7 @@ // 渲染步骤条 var stepItems = param.stepItems; - renderDom(param.elem, stepItems, param.position||0); + renderDom(param.elem, stepItems, param.position||0,param.number); $('.lay-step').css('width', param.stepWidth); //监听轮播切换事件 diff --git a/target/classes/templates/index.html b/target/classes/templates/index.html index ab4417a1..f7aba988 100644 --- a/target/classes/templates/index.html +++ b/target/classes/templates/index.html @@ -51,6 +51,10 @@
            + +
          • + +
            • @@ -151,9 +155,11 @@ }; options.iniUrl= "/index/menus?uid="+uid // 初始化接口 miniAdmin.render(options); - console.log(options) + /*$("#scan").on("click",function () { + alert("扫一扫") + });*/ // 百度统计代码，只统计指定域名 diff --git a/target/classes/templates/pages/application/application-review.html b/target/classes/templates/pages/application/application-review.html index db7f5a85..9681f867 100644 --- a/target/classes/templates/pages/application/application-review.html +++ b/target/classes/templates/pages/application/application-review.html @@ -156,13 +156,15 @@ var state=$("#state").text(); //当前处于的状态 - var position=0,states={}; + var position=0,states={},number = 1; if (state === "待部门负责人审核" || state === "部门负责人审核未通过") { - position = 1; - states = [{title: "提交申请"}, {title: state}, {title: "未入库"}]; + // , {title: "未入库"} + states = [ {title: state}]; + number = 2; } else { - position = 2; - states = [{title: "提交申请"}, {title: "审核通过"}, {title: state}]; + // {title: "提交申请"}, + states = [ {title: state}]; + number = 3; } step.render({ elem: '#stepForm', @@ -171,6 +173,7 @@ stepWidth: '750px', height: '650px', position: position, + number:number, stepItems: states }); diff --git a/target/classes/templates/pages/application/application-transfer.html b/target/classes/templates/pages/application/application-transfer.html index 06736514..10267d00 100644 --- a/target/classes/templates/pages/application/application-transfer.html +++ b/target/classes/templates/pages/application/application-transfer.html @@ -203,6 +203,7 @@ $('.next').click(function () { step.next('#stepForm'); + }); // 实现卡片添加 diff --git a/target/classes/templates/pages/application/my-apply.html b/target/classes/templates/pages/application/my-apply.html index 5d65c981..e8d2acc9 100644 --- a/target/classes/templates/pages/application/my-apply.html +++ b/target/classes/templates/pages/application/my-apply.html @@ -10,28 +10,26 @@ +
            入库记录 - - - - - - - - -
            +
              出库申请 - - - - - - - - -
              +
                @@ -39,44 +37,46 @@ diff --git a/target/classes/templates/pages/application/my-task.html b/target/classes/templates/pages/application/my-task.html index 8b363a37..cbb45278 100644 --- a/target/classes/templates/pages/application/my-task.html +++ b/target/classes/templates/pages/application/my-task.html @@ -10,36 +10,31 @@ + +
                未完成任务
                - - - - - - - - - -
                +
                  已完成任务
                  - - - - - - - - - -
                  +
                    @@ -56,10 +51,11 @@ //先声明 function openDetail2(data) { }; - layui.use(['flow', 'layer', 'flow', 'util'], function () { + layui.use(['flow', 'layer', 'table', 'util'], function () { var $ = layui.jquery, layer = layui.layer, flow = layui.flow, + table = layui.table, util = layui.util; //每页的数量 var size=8; @@ -72,26 +68,21 @@ let lis = []; let result; $.get('/depositoryRecord/myTask?page='+page+'&size='+size+'&isDone=0', function(res){ + var Width = "25%"; result=res.data; - console.log(res) + lis.push("
                    ") for (let i=0;i'); + if(isMobile()){ + Width = "50%"; } - lis.push('

                    ' +result[i].applicantName+'的') lis.push('出库请求

                    '); - lis.push('
                    '+result[i].applyRemark - +'
                    ' - +result[i].applicantTime+'
                    '); - if (i%4===3){ - lis.push(''); - } - } - if (result.length%4!==0){ - lis.push(''); + lis.push('
                    ' + +result[i].applicantTime+'
                    '); } + lis.push('
                    '); pre1+=result.length; //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页 //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多 @@ -107,29 +98,25 @@ let lis = []; let result; $.get('/depositoryRecord/myTask?page='+page+'&size='+size+'&isDone=1', function(res){ + var Width = "25%"; result=res.data; + lis.push("
                    ") for (let i=0;i'); + if(isMobile()){ + Width = "50%"; } - lis.push('

                    ' + lis.push('

                  • ' +result[i].applicantName+'的') if (result[i].type===1){ lis.push('入库请求

                    '); }else { lis.push('出库请求

                    • '); } - lis.push('
                    '+result[i].applyRemark - +'
                    ' - +result[i].applicantTime+'
                    '); - if (i%4===3){ - lis.push(''); - } - } - if (result.length%4!==0){ - lis.push(''); + lis.push('
                    ' + +result[i].applicantTime+'
                    '); } + lis.push("
                  ") pre2+=result.length; //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页 //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多 @@ -174,6 +161,14 @@ }); } + //定义一个函数判断是手机端还是pc端 + function isMobile(){ + if(window.navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) { + return true; // 移动端 + }else{ + return false; // PC端 + } + } }); \ No newline at end of file diff --git a/target/classes/templates/pages/application/my-task_back.html b/target/classes/templates/pages/application/my-task_back.html index fc62fa78..429f27ee 100644 --- a/target/classes/templates/pages/application/my-task_back.html +++ b/target/classes/templates/pages/application/my-task_back.html @@ -30,15 +30,8 @@
                  已完成任务
                  - - - - - - - - +
                  @@ -58,10 +51,11 @@ //先声明 function openDetail2(data) { }; - layui.use(['flow', 'layer', 'flow', 'util'], function () { + layui.use(['flow', 'layer', 'table', 'util'], function () { var $ = layui.jquery, layer = layui.layer, flow = layui.flow, + table = layui.table, util = layui.util; //每页的数量 var size=8; @@ -77,19 +71,15 @@ result=res.data; for (let i=0;i'); + lis.push(''); } - lis.push('

                  ' +result[i].applicantName+'的') - if (result[i].type===1){ - lis.push('入库请求

                  '); - }else { - lis.push('出库请求
                  '); - } + lis.push('出库请求
                  '); lis.push('
                  '+result[i].applyRemark +'
                  ' - +result[i].applyTime+'
                  '); + +result[i].applicantTime+''); if (i%4===3){ lis.push(''); } @@ -115,10 +105,10 @@ result=res.data; for (let i=0;i'); + lis.push(''); } lis.push('

                  ' + +result[i].id+')" >

                  ' +result[i].applicantName+'的') if (result[i].type===1){ lis.push('入库请求

                  '); @@ -127,7 +117,7 @@ } lis.push('
                  '+result[i].applyRemark +'
                  ' - +result[i].applyTime+'

                  '); + +result[i].applicantTime+'
                  '); if (i%4===3){ lis.push(''); } @@ -169,7 +159,7 @@ maxmin: true, shadeClose: true, area: ['100%', '100%'], - content: '/form_step_look?id='+item, + content: '/ApplicationOutView?id='+item, end:function () { location.reload() }