diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/StockTaking.java b/src/main/java/com/dreamchaser/depository_manage/entity/StockTaking.java new file mode 100644 index 00000000..2dba586d --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/entity/StockTaking.java @@ -0,0 +1,60 @@ +package com.dreamchaser.depository_manage.entity; + +import lombok.Data; + +/** + * 用于保存盘点记录 + */ +@Data +public class StockTaking { + /** + * id + */ + private Long id; + + /** + * 盘点单号 + */ + private String code; + + + /** + * 负责人 + */ + private String departmentManager; + + /** + * 盘点仓库 + */ + private Integer placeId; + + /** + * 盘点库位 + */ + private Integer depositoryId; + + /** + * 1通过2驳回3待处理 + */ + private Integer state; + + /** + * 盘点发起人 + */ + private Integer originator; + + /** + * 申请时间 + */ + private Long createTime; + + /** + * 审核时间 + */ + private Long completeTime; + + /** + * 审核意见 + */ + private String auditOpinion; +} diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml new file mode 100644 index 00000000..ac4a2941 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + st.id,st.code,st.depositoryId,st.placeId,st.departmentManager,st.state,st.createTime,st.originator,st.completeTime,st.auditOpinion + + + + id,mid,oldInventory,newInventory,inventory,mainId,takingResult,mname,mtId,tname,mcode,mversion,munit,mtexture + + + + + INSERT INTO stocktaking (id,code,depositoryId,placeId,departmentManager,state,createTime,originator) + values ( + #{id}, + #{code}, + #{depositoryId}, + #{placeId}, + #{departmentManager}, + #{state}, + #{createTime}, + #{originator} + ) + + + + + INSERT INTO stocktakingchild (id,mid,oldInventory,newInventory,takingResult,inventory,mainId) + values ( + #{id},#{mid},#{oldInventory},#{newInventory},#{takingResult},#{inventory},#{mainId} + ) + + + + + delete from stocktakingchild where id = #{id} + + + + delete from stocktakingchild + where id in + + #{id} + + + + + delete from stocktaking where id = #{id} + + + + delete from stocktaking + where id in + + #{id} + + + + + update stocktaking + + + code = #{code}, + + + depositoryId = #{depositoryId}, + + + placeId = #{placeId}, + + + departmentManager = #{departmentManager}, + + + state = #{state}, + + + createTime = #{createTime}, + + + originator = #{originator}, + + + auditOpinion = #{auditOpinion}, + + + completeTime = #{completeTime} + + + where id = #{id} + + + + + update stocktakingchild + + + mid = #{mid}, + + + oldInventory = #{oldInventory}, + + + newInventory = #{newInventory}, + + + takingResult = #{takingResult}, + + + inventory = #{inventory}, + + + mainId = #{mainId} + + + where id = #{id} + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingChildP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingChildP.java new file mode 100644 index 00000000..5e8f7340 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingChildP.java @@ -0,0 +1,96 @@ +package com.dreamchaser.depository_manage.pojo; + +import com.dreamchaser.depository_manage.entity.MaterialAndBarCode; +import com.dreamchaser.depository_manage.entity.StockTakingChild; +import lombok.Data; + +import java.util.List; + +/** + * 盘点记录 + */ +@Data +public class StockTakingChildP { + /** + * id + */ + private Long id; + /** + * 物料id + */ + private Integer mid; + /** + * 库存容量 + */ + private Integer oldInventory; + /** + * 盘点数量 + */ + private Integer newInventory; + /** + * 盘点结果 + */ + private String takingResult; + + /** + * 盘点结果（展示） + */ + private String takingResultShow; + /** + * 盈亏数量 + */ + private Integer inventory; + + /** + * 盘点单号 + */ + private String code; + + /** + * 物料名称 + */ + private String mname; + + /** + * 物料编码 + */ + private String mcode; + + /** + * 物料与条形码的对应关系 + */ + private List materialAndBarCodeList; + + /** + * 类型id + */ + private Long mtId; + + /** + * 类型名称 + */ + private String tname; + + /** + * 物料材质 + */ + private String mtexture; + + /** + * 物料规格型号 + */ + private String mversion; + + /** + * 物料计量单位 + */ + private String munit; + + /** + * 主表id + */ + private Long mainId; + + + +} diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingP.java new file mode 100644 index 00000000..3c35e3d2 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingP.java @@ -0,0 +1,93 @@ +package com.dreamchaser.depository_manage.pojo; + +import com.dreamchaser.depository_manage.entity.StockTaking; +import com.dreamchaser.depository_manage.utils.DateUtil; +import lombok.Data; + +@Data +public class StockTakingP { + /** + * id + */ + private Long id; + + /** + * 盘点单号 + */ + private String code; + + + /** + * 负责人 + */ + private String departmentManager; + + /** + * 盘点仓库 + */ + private Integer placeId; + + /** + * 盘点库位 + */ + private Integer depositoryId; + + /** + * 库位编码 + */ + private String placeCode; + + /** + * 仓库名称 + */ + private String depositoryName; + + /** + * 负责人名称 + */ + private String departmentManagerName; + + /** + * 1通过2驳回3待处理 + */ + private Integer state; + + /** + * 申请时间 + */ + private String createTime; + + + /** + * 审核时间 + */ + private String completeTime; + + /** + * 盘点发起人 + */ + private Integer originator; + + /** + * 盘点发起人姓名 + */ + private String originatorName; + + /** + * 审核意见 + * + */ + private String auditOpinion; + + public StockTakingP(StockTaking st) { + this.id = st.getId(); + this.code = st.getCode(); + this.departmentManager = st.getDepartmentManager(); + this.depositoryId = st.getDepositoryId(); + this.placeId = st.getPlaceId(); + this.state = st.getState(); + this.createTime = DateUtil.TimeStampToDateTime(st.getCreateTime()); + this.originator = st.getOriginator(); + this.auditOpinion = st.getAuditOpinion(); + } +} diff --git a/src/main/resources/templates/pages/post/selectManager.html b/src/main/resources/templates/pages/post/selectManager.html new file mode 100644 index 00000000..1ab7ad2f --- /dev/null +++ b/src/main/resources/templates/pages/post/selectManager.html @@ -0,0 +1,65 @@ + + + + + layui + + + + + + + +
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarCodeForTaking.html b/src/main/resources/templates/pages/scanQrCode/ScanBarCodeForTaking.html new file mode 100644 index 00000000..ab45084b --- /dev/null +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarCodeForTaking.html @@ -0,0 +1,132 @@ + + + + + + 扫码 + + + + + + + + + + + + + +
+ +
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html new file mode 100644 index 00000000..06687cae --- /dev/null +++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html @@ -0,0 +1,1162 @@ + + + + + 仓库盘点 + + + + + + + + + +
+
+ + +
+
+ + + + + \ No newline at end of file diff --git a/target/classes/.restartTriggerFile b/target/classes/.restartTriggerFile new file mode 100644 index 00000000..e69de29b diff --git a/target/classes/META-INF/depository_manage (2).kotlin_module b/target/classes/META-INF/depository_manage (2).kotlin_module new file mode 100644 index 00000000..a49347af Binary files /dev/null and b/target/classes/META-INF/depository_manage (2).kotlin_module differ diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml new file mode 100644 index 00000000..ac4a2941 --- /dev/null +++ b/target/classes/com/dreamchaser/depository_manage/mapper/StockTakingMapper.xml @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + st.id,st.code,st.depositoryId,st.placeId,st.departmentManager,st.state,st.createTime,st.originator,st.completeTime,st.auditOpinion + + + + id,mid,oldInventory,newInventory,inventory,mainId,takingResult,mname,mtId,tname,mcode,mversion,munit,mtexture + + + + + INSERT INTO stocktaking (id,code,depositoryId,placeId,departmentManager,state,createTime,originator) + values ( + #{id}, + #{code}, + #{depositoryId}, + #{placeId}, + #{departmentManager}, + #{state}, + #{createTime}, + #{originator} + ) + + + + + INSERT INTO stocktakingchild (id,mid,oldInventory,newInventory,takingResult,inventory,mainId) + values ( + #{id},#{mid},#{oldInventory},#{newInventory},#{takingResult},#{inventory},#{mainId} + ) + + + + + delete from stocktakingchild where id = #{id} + + + + delete from stocktakingchild + where id in + + #{id} + + + + + delete from stocktaking where id = #{id} + + + + delete from stocktaking + where id in + + #{id} + + + + + update stocktaking + + + code = #{code}, + + + depositoryId = #{depositoryId}, + + + placeId = #{placeId}, + + + departmentManager = #{departmentManager}, + + + state = #{state}, + + + createTime = #{createTime}, + + + originator = #{originator}, + + + auditOpinion = #{auditOpinion}, + + + completeTime = #{completeTime} + + + where id = #{id} + + + + + update stocktakingchild + + + mid = #{mid}, + + + oldInventory = #{oldInventory}, + + + newInventory = #{newInventory}, + + + takingResult = #{takingResult}, + + + inventory = #{inventory}, + + + mainId = #{mainId} + + + where id = #{id} + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/templates/pages/material/selectMaterialByCardForTaking.html b/target/classes/templates/pages/material/selectMaterialByCardForTaking.html new file mode 100644 index 00000000..4abd2b7c --- /dev/null +++ b/target/classes/templates/pages/material/selectMaterialByCardForTaking.html @@ -0,0 +1,74 @@ + + + + + layui + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/target/classes/templates/pages/post/selectManager.html b/target/classes/templates/pages/post/selectManager.html new file mode 100644 index 00000000..1ab7ad2f --- /dev/null +++ b/target/classes/templates/pages/post/selectManager.html @@ -0,0 +1,65 @@ + + + + + layui + + + + + + + +
+ + + + \ No newline at end of file diff --git a/target/classes/templates/pages/scanQrCode/ScanBarCodeForTaking.html b/target/classes/templates/pages/scanQrCode/ScanBarCodeForTaking.html new file mode 100644 index 00000000..ab45084b --- /dev/null +++ b/target/classes/templates/pages/scanQrCode/ScanBarCodeForTaking.html @@ -0,0 +1,132 @@ + + + + + + 扫码 + + + + + + + + + + + + + +
+ +
+ + + + \ No newline at end of file diff --git a/target/classes/templates/pages/scanQrCode/ScanCodeByTaking.html b/target/classes/templates/pages/scanQrCode/ScanCodeByTaking.html new file mode 100644 index 00000000..7e9b6faa --- /dev/null +++ b/target/classes/templates/pages/scanQrCode/ScanCodeByTaking.html @@ -0,0 +1,100 @@ + + + + + + 扫码 + + + + + + + + + + + + + +
+ +
+ + + + \ No newline at end of file diff --git a/target/classes/templates/pages/scanQrCode/ScanMaterialCodeForTaking.html b/target/classes/templates/pages/scanQrCode/ScanMaterialCodeForTaking.html new file mode 100644 index 00000000..d61e72ee --- /dev/null +++ b/target/classes/templates/pages/scanQrCode/ScanMaterialCodeForTaking.html @@ -0,0 +1,202 @@ + + + + + + 扫码 + + + + + + + + + + + + + + + +
+ +
+ Long validation in progress... +
+ +
+ + + + \ No newline at end of file diff --git a/target/classes/templates/pages/stockTaking/stockTaking.html b/target/classes/templates/pages/stockTaking/stockTaking.html new file mode 100644 index 00000000..06687cae --- /dev/null +++ b/target/classes/templates/pages/stockTaking/stockTaking.html @@ -0,0 +1,1162 @@ + + + + + 仓库盘点 + + + + + + + + + +
+
+ + +
+
+ + + + + \ No newline at end of file diff --git a/target/classes/templates/pages/stockTaking/stockTakingReview.html b/target/classes/templates/pages/stockTaking/stockTakingReview.html new file mode 100644 index 00000000..b951d090 --- /dev/null +++ b/target/classes/templates/pages/stockTaking/stockTakingReview.html @@ -0,0 +1,350 @@ + + + + + 仓库盘点 + + + + + + + + + +
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/target/classes/templates/pages/stockTaking/stockTakingView.html b/target/classes/templates/pages/stockTaking/stockTakingView.html new file mode 100644 index 00000000..cea6c1b5 --- /dev/null +++ b/target/classes/templates/pages/stockTaking/stockTakingView.html @@ -0,0 +1,291 @@ + + + + + 仓库盘点 + + + + + + + + + +
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/target/classes/templates/pages/stockTaking/stockTransfer.html b/target/classes/templates/pages/stockTaking/stockTransfer.html new file mode 100644 index 00000000..2f3243b9 --- /dev/null +++ b/target/classes/templates/pages/stockTaking/stockTransfer.html @@ -0,0 +1,395 @@ + + + + + 仓库盘点 + + + + + + + + + +
+
+
+
+ 转移盘点 +
+
+
+
+
+ +
+ + + + + +
+
+
+ +
+ 转移明细 +
+
+ +
+
+

+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file