north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
@@ -366,7 +366,6 @@ const tags = ref([]) const activeName = ref(null) console.log(TgaStyleSet.value) // 注册默认面板 hiprint.init({ providers: [new TagStyleSet(TgaStyleSet.value)], north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -19,7 +19,7 @@ }) //工序 const value = ref(t('machine.edgeGrinding')) const value = ref() //表尾求和 const sumNum = (list, field) => { @@ -49,6 +49,13 @@ //定义当前页数 let pageNum = ref(1) let pageState = null let newItem= ref({ basic_name: '全部', basic_type: 'product', basic_category: 'process', id: "001" }) //获取七天前到当前时间 function getNowTime() { @@ -88,6 +95,7 @@ pageTotal.value = res.data.total produceList = produceList.value.concat(deepClone(res.data.data)) titleSelectJson.value.processType = res.data.process titleSelectJson.value.processType.unshift(newItem.value) xGrid.value.reloadData(produceList) gridOptions.loading = false } else { @@ -219,7 +227,7 @@ },//表头参数 columns: [ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50}, {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 40}, {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50}, { field: 'reportingWorkTime', width: 160, title: t('reportingWorks.reportingWorkTime'), }, @@ -239,7 +247,7 @@ { field: 'processId', width: 140, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } }, {field: 'orderNumber', width: 60, title: t('order.OrderNum')}, {field: 'orderNumber', width: 90, title: t('order.OrderNum')}, {field: 'code', width: 60, title: t('reportingWorks.glassNumber')}, {field: 'width', width: 100, title: t('order.width')}, {field: 'height', width: 100, title: t('order.height')}, @@ -358,7 +366,7 @@ <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" > @@ -373,7 +381,19 @@ </ul> </template> <template #pager> <!--使用 pager 插槽--> <!-- 'PrevJump','NextJump', --> <vxe-pager v-model:current-page="pageNum" v-model:page-size="total.pageSize" v-model:pager-count="total.pageTotal" :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']" :total="total.dataTotal" @page-change="handlePageChange" > </vxe-pager> </template> <template #num1_filter="{ column, $panel }"> <div> <div v-for="(option, index) in column.filters" :key="index"> @@ -396,7 +416,7 @@ <style scoped> .main-div-customer { width: 99%; height: 100%; height: 90%; } #selectForm { north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -142,7 +142,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("addSelectWarehousing"); sysErrorService.insert(sysError); saveState = false; @@ -234,7 +234,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("addDeliveryDetail"); sysErrorService.insert(sysError); saveState = false; @@ -304,7 +304,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateFinishedGoodsInventoryAllocate"); sysErrorService.insert(sysError); saveState = false; @@ -387,7 +387,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateFinishedGoodsInventoryTakeOut"); sysErrorService.insert(sysError); saveState = false; @@ -470,7 +470,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateFinishedGoodsInventoryRework"); sysErrorService.insert(sysError); saveState = false; @@ -517,7 +517,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateFinishedGoodsInventoryToExamine"); sysErrorService.insert(sysError); saveState = false; @@ -554,7 +554,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("cancelFinishedGoodsInventoryToExamine"); sysErrorService.insert(sysError); saveState = false; @@ -680,7 +680,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("cancelFinishedGoodsInventoryStorage"); sysErrorService.insert(sysError); saveState = false; @@ -722,7 +722,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("oneClickStorage"); sysErrorService.insert(sysError); saveState = false; north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -108,8 +108,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("saveMaterialOutbound"); sysErrorService.insert(sysError); saveState = false; @@ -120,28 +120,41 @@ public Boolean saveMaterialInventory(Map<String,Object> object) { boolean saveState = true; Double singlePieceArea = 0.0; Double totalArea = 0.0; Long materialCode = 0L; if (object.get("singlePieceArea") != null) { singlePieceArea = Double.valueOf(object.get("singlePieceArea").toString()); } if (object.get("totalArea") != null) { totalArea = Double.valueOf(object.get("totalArea").toString()); } if (object.get("materialCode") != null) { materialCode = Long.valueOf(object.get("materialCode").toString()); } //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); try { Double singlePieceArea = 0.0; Double totalArea = 0.0; Long materialCode = 0L; if (object.get("singlePieceArea") != null) { singlePieceArea = Double.valueOf(object.get("singlePieceArea").toString()); } if (object.get("totalArea") != null) { totalArea = Double.valueOf(object.get("totalArea").toString()); } if (object.get("materialCode") != null) { materialCode = Long.valueOf(object.get("materialCode").toString()); } MaterialInventory materialInventory = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialInventory.class); MaterialInventory materialInventory = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), MaterialInventory.class); //查询物料是否存在 Integer MaterialInventoryCount = materialInventoryMapper.getMaterialInventoryCount(materialCode,materialInventory.getDateOfManufacture()); //查询物料是否存在 Integer MaterialInventoryCount = materialInventoryMapper.getMaterialInventoryCount(materialCode,materialInventory.getDateOfManufacture()); if(MaterialInventoryCount>0){ materialInventoryMapper.updateMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory); }else { materialInventoryMapper.insertMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory); if(MaterialInventoryCount>0){ materialInventoryMapper.updateMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory); }else { materialInventoryMapper.insertMaterialInventory(materialCode,singlePieceArea,totalArea,materialInventory); } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("saveMaterialInventory"); sysErrorService.insert(sysError); saveState = false; } return saveState; @@ -238,8 +251,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("deleteMaterialOutbound"); sysErrorService.insert(sysError); saveState = false; @@ -338,8 +351,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateMaterialOutboundToExamine"); sysErrorService.insert(sysError); saveState = false; @@ -354,11 +367,12 @@ boolean saveState = true; //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); String returningId = ""; String oddNumber; if (object.get("returningId") != null) { returningId = object.get("returningId").toString(); } try { String returningId = ""; String oddNumber; if (object.get("returningId") != null) { returningId = object.get("returningId").toString(); } ReturningWarehouse returningWarehouse = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), ReturningWarehouse.class); List<ReturningWarehouseDetail> returningWarehouseDetailList = JSONArray.parseArray(JSONObject.toJSONString(object.get("returningWarehouseDetail")), ReturningWarehouseDetail.class); //查询出库单是否存在 @@ -440,7 +454,16 @@ } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("saveReturningWarehouse"); sysErrorService.insert(sysError); saveState = false; } return saveState; } @@ -499,8 +522,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("updateReturningWarehouseToExamine"); sysErrorService.insert(sysError); saveState = false;
@@ -30,6 +30,9 @@ public Boolean saveMaterialStore(Map<String,Object> object) { boolean saveState = true; //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); try { String id = ""; String type = ""; String json = ""; @@ -61,7 +64,16 @@ }else{ materialStoreMapper.insertMaterialStore(type,json); } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("saveMaterialStore"); sysErrorService.insert(sysError); saveState = false; } return saveState; } @@ -94,8 +106,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("deleteMaterialStore"); sysErrorService.insert(sysError); saveState = false;
@@ -410,6 +410,9 @@ } public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) { if (selectProcesses.equals("全部")){ selectProcesses=""; } Integer offset = (pageNum - 1) * pageSize; Map<String, Object> map = new HashMap<>(); map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO)); north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
@@ -46,21 +46,21 @@ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); try { Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class); if(customer!=null){ customer=null; if (customer.getId()!=null && customer.getId()!=0){ customerMapper.updateCustomer(customer); }else{ customerMapper.insertCustomer(customer); } } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("insertCustomer"); sysErrorService.insert(sysError); saveState = false; @@ -88,8 +88,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("deleteCustomer"); sysErrorService.insert(sysError); saveState = false;
@@ -325,8 +325,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("insertDelivery"); sysErrorService.insert(sysError); saveState = false; @@ -383,8 +383,8 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); //将异常传入数据库 SysError sysError = new SysError(); sysError.setError(e.toString()); sysError.setFunc("saveOrder"); sysError.setError(e+Arrays.toString(e.getStackTrace())); sysError.setFunc("deleteDelivery"); sysErrorService.insert(sysError); saveState = false;
@@ -1229,7 +1229,7 @@ ) AS pd ON pd.prod_id = od.product_id AND pd.glass_sort = rwd.technology_number where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and rw.this_process=#{selectProcesses} and position(#{selectProcesses} in rw.this_process) <if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''"> and rw.this_process regexp #{teamOutputDTO.thisProcess} </if> @@ -1265,8 +1265,8 @@ <select id="teamOutputPageTotal"> SELECT CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal', count(distinct rw.reporting_work_id) as 'total' CEILING(count(rwd.id)/#{pageSize}) as 'pageTotal', count(distinct rwd.id) as 'total' FROM reporting_work AS rw LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id @@ -1289,7 +1289,7 @@ ) AS pd ON pd.prod_id = od.product_id AND pd.glass_sort = rwd.technology_number where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and rw.this_process=#{selectProcesses} and position(#{selectProcesses} in rw.this_process) <if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''"> and rw.this_process regexp #{teamOutputDTO.thisProcess} </if>
