licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: licq:da6b435eeb2dd5ca33f5f38b976cd58f75d8a106
Branches Tags
licq:main
..
compare: licq:671150e40ddb26cf9bab4d65938f8795f095bad7
Branches Tags
licq:main

No commits in common. "da6b435eeb2dd5ca33f5f38b976cd58f75d8a106" and "671150e40ddb26cf9bab4d65938f8795f095bad7" have entirely different histories.
da6b435eeb ... 671150e40d

4 changed files with 6 additions and 11 deletions
Show Stats Expand all files Collapse all files

11
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java
View File

@ -157,7 +157,7 @@ public class StorageCheckServiceImpl implements StorageCheckService {
storageDO.setStockInType(stockInType); storageDO.setStockInType(stockInType);
storageDO.setStockNo(UUID.fastUUID().toString(true)); storageDO.setStockNo(UUID.fastUUID().toString(true));
storageDO.setHeaderNo(storageCheckDO.getStockNo()); storageDO.setHeaderNo(storageCheckDO.getStockNo());
storageDO.setStatus(1);
storageDO.setDescription(storageCheckDO.getDescription()); storageDO.setDescription(storageCheckDO.getDescription());
storageDO.setWhId(storageCheckDO.getWhId()); storageDO.setWhId(storageCheckDO.getWhId());
storageDO.setKeeper(storageCheckDO.getKeeper()); storageDO.setKeeper(storageCheckDO.getKeeper());
@ -165,11 +165,8 @@ public class StorageCheckServiceImpl implements StorageCheckService {
storageDO.setOutbound(storageCheckDO.getKeeper()); storageDO.setOutbound(storageCheckDO.getKeeper());
storageDO.setOutboundTime(current); storageDO.setOutboundTime(current);
storageDO.setDescription("由盘点单号"+storageCheckDO.getStockNo()+"提交产生"); storageDO.setDescription("由盘点单号"+storageCheckDO.getStockNo()+"提交产生");
if(stockType == 1){
storageDO.setStatus(2);
}else{
storageDO.setStatus(4);
}
storageMapper.insert(storageDO); storageMapper.insert(storageDO);
storageDO.setStockNo(STOCK_IN.getCode(storageDO.getId().toString())); storageDO.setStockNo(STOCK_IN.getCode(storageDO.getId().toString()));
storageMapper.updateById(storageDO); storageMapper.updateById(storageDO);
@ -224,7 +221,7 @@ public class StorageCheckServiceImpl implements StorageCheckService {
} }
} }
} }
storageMapper.deleteById(storageDO.getId());
} }
private void saveStorageMat(StorageCheckDO storageCheckDO, Long stockId, Integer stockType){ private void saveStorageMat(StorageCheckDO storageCheckDO, Long stockId, Integer stockType){

2
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchDetailMapper.xml
View File

@ -102,7 +102,7 @@
</if> </if>
GROUP BY t.id GROUP BY t.id
</select> </select>
<select id="sumAssembleReport" parameterType="java.util.List" resultType="java.util.HashMap"> <select id="sumAssembleReport" parameterType="java.util.List">
select t.dispatch_detail_id as detailId,count(t.id) as amount from pro_task_report t where t.dispatch_detail_id in select t.dispatch_detail_id as detailId,count(t.id) as amount from pro_task_report t where t.dispatch_detail_id in
<foreach collection="list" item="id" open="(" separator="," close=")"> <foreach collection="list" item="id" open="(" separator="," close=")">
#{id} #{id}

3
mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue
View File

@ -24,7 +24,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, nextTick } from 'vue' import { onMounted, nextTick } from 'vue'
import JsBarcode from 'jsbarcode' import JsBarcode from 'jsbarcode'
import printFinalDialog from './printFinalDialog.vue';
const dialogVisible = ref(false) const dialogVisible = ref(false)
let clauseId = null; let clauseId = null;
const startPageNum = ref(0); const startPageNum = ref(0);
@ -168,7 +168,6 @@ const open = async (vals) => {
// 创建canvas元素用于生成条形码 // 创建canvas元素用于生成条形码
const canvas = document.createElement('canvas') const canvas = document.createElement('canvas')
JsBarcode(canvas, item.code, { JsBarcode(canvas, item.code, {
format: "CODE128",
width: 2, width: 2,
height: 40, height: 40,
displayValue: false, displayValue: false,

1
mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printFinalDialog.vue
View File

@ -162,7 +162,6 @@ const open = async (vals) => {
// 创建canvas元素用于生成条形码 // 创建canvas元素用于生成条形码
const canvas = document.createElement('canvas') const canvas = document.createElement('canvas')
JsBarcode(canvas, item.code, { JsBarcode(canvas, item.code, {
format: "CODE128",
width: 2, width: 2,
height: 40, height: 40,
displayValue: false, displayValue: false,