From eaf2992f9f885a03b2bf3afcd9d990b2169ba271 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 26 十月 2023 18:12:20 +0800
Subject: [PATCH] feat: 调拨单出库
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java | 18
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 70
consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java | 16
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 268 +++
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure.java | 44
consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java | 24
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java | 419 +++++
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java | 29
consum-base/doc/项目资料/河南邮政低值易耗品V20231023.pdm | 700 ++++----
consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow.java | 24
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java | 575 +++++++
consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java | 853 +++++++++++
consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java | 14
consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java | 6
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java | 414 +++++
consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java | 79 +
consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java | 75 +
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure_mapper.java | 36
consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java | 656 +++++++++
19 files changed, 3,900 insertions(+), 420 deletions(-)
diff --git "a/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231023.pdm" "b/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231023.pdm"
index df62ba6..4253457 100644
--- "a/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231023.pdm"
+++ "b/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231023.pdm"
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1698127600" Name="Physical Data Model 1" Objects="475" Symbols="54" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.7.4.6866"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1698127600" Name="Physical Data Model 1" Objects="478" Symbols="54" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.7.4.6866"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5250,9 +5250,9 @@
<c:Symbols>
<o:ArchitectureAreaSymbol Id="o132">
<a:CreationDate>1696995089</a:CreationDate>
-<a:ModificationDate>1698045659</a:ModificationDate>
+<a:ModificationDate>1698283764</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-319777,-117749), (19284,283375))</a:Rect>
+<a:Rect>((-319777,-117749), (135508,283375))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>418425</a:LineColor>
<a:FillColor>15399421</a:FillColor>
@@ -5267,7 +5267,7 @@
<c:SubSymbols>
<o:ExtendedDependencySymbol Id="o133">
<a:CreationDate>1697872442</a:CreationDate>
-<a:ModificationDate>1698124004</a:ModificationDate>
+<a:ModificationDate>1698283764</a:ModificationDate>
<a:Rect>((-304332,87186), (-302932,114406))</a:Rect>
<a:ListOfPoints>((-303632,114006),(-303632,87586))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
@@ -5287,9 +5287,9 @@
</o:ExtendedDependencySymbol>
<o:ReferenceSymbol Id="o137">
<a:CreationDate>1698037943</a:CreationDate>
-<a:ModificationDate>1698046399</a:ModificationDate>
-<a:Rect>((-163462,191073), (-46137,192323))</a:Rect>
-<a:ListOfPoints>((-46537,191698),(-163062,191698))</a:ListOfPoints>
+<a:ModificationDate>1698283767</a:ModificationDate>
+<a:Rect>((-173273,116689), (31240,221691))</a:Rect>
+<a:ListOfPoints>((30840,221291),(30840,117314),(-172873,117314))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5309,9 +5309,9 @@
</o:ReferenceSymbol>
<o:ExtendedDependencySymbol Id="o141">
<a:CreationDate>1698033157</a:CreationDate>
-<a:ModificationDate>1698045045</a:ModificationDate>
-<a:Rect>((-199663,109651), (-80370,225711))</a:Rect>
-<a:ListOfPoints>((-80770,110051),(-126098,110051),(-126098,225011),(-199263,225011))</a:ListOfPoints>
+<a:ModificationDate>1698283893</a:ModificationDate>
+<a:Rect>((-209774,33263), (-135733,134307))</a:Rect>
+<a:ListOfPoints>((-136133,33663),(-136133,73786),(-209074,73786),(-209074,133907))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@@ -5330,9 +5330,9 @@
</o:ExtendedDependencySymbol>
<o:ExtendedDependencySymbol Id="o144">
<a:CreationDate>1698030810</a:CreationDate>
-<a:ModificationDate>1698041038</a:ModificationDate>
-<a:Rect>((-284562,134474), (-201488,209118))</a:Rect>
-<a:ListOfPoints>((-284162,134874),(-284162,208418),(-201888,208418))</a:ListOfPoints>
+<a:ModificationDate>1698283764</a:ModificationDate>
+<a:Rect>((-284562,113492), (-211299,115192))</a:Rect>
+<a:ListOfPoints>((-284162,114792),(-284162,114192),(-211699,114192))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@@ -5351,9 +5351,9 @@
</o:ExtendedDependencySymbol>
<o:ReferenceSymbol Id="o147">
<a:CreationDate>1696836074</a:CreationDate>
-<a:ModificationDate>1698041038</a:ModificationDate>
-<a:Rect>((-182476,190698), (-63193,243944))</a:Rect>
-<a:ListOfPoints>((-182076,191098),(-63818,191098),(-63818,243544))</a:ListOfPoints>
+<a:ModificationDate>1698283764</a:ModificationDate>
+<a:Rect>((-192287,99594), (-122761,215912))</a:Rect>
+<a:ListOfPoints>((-191887,99994),(-123386,99994),(-123386,215512))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5374,9 +5374,9 @@
</o:ReferenceSymbol>
<o:ExtendedDependencySymbol Id="o150">
<a:CreationDate>1698032367</a:CreationDate>
-<a:ModificationDate>1698123862</a:ModificationDate>
-<a:Rect>((-256744,124580), (-80370,125980))</a:Rect>
-<a:ListOfPoints>((-80770,125280),(-256344,125280))</a:ListOfPoints>
+<a:ModificationDate>1698283893</a:ModificationDate>
+<a:Rect>((-256744,32042), (-135733,125980))</a:Rect>
+<a:ListOfPoints>((-136133,32442),(-232122,32442),(-232122,125280),(-256344,125280))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@@ -5395,9 +5395,9 @@
</o:ExtendedDependencySymbol>
<o:ExtendedDependencySymbol Id="o153">
<a:CreationDate>1698030805</a:CreationDate>
-<a:ModificationDate>1698127663</a:ModificationDate>
-<a:Rect>((-259665,125409), (-108161,252280))</a:Rect>
-<a:ListOfPoints>((-259265,125809),(-259265,251580),(-108561,251580))</a:ListOfPoints>
+<a:ModificationDate>1698283764</a:ModificationDate>
+<a:Rect>((-259665,125409), (-167729,224248))</a:Rect>
+<a:ListOfPoints>((-259265,125809),(-259265,223548),(-168129,223548))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>8</a:ArrowStyle>
<a:LineColor>16744576</a:LineColor>
@@ -5416,7 +5416,7 @@
</o:ExtendedDependencySymbol>
<o:ArchitectureAreaSymbol Id="o156">
<a:CreationDate>1697869311</a:CreationDate>
-<a:ModificationDate>1698124010</a:ModificationDate>
+<a:ModificationDate>1698283764</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-311718,30252), (-248072,92114))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
@@ -5559,7 +5559,7 @@
</o:ArchitectureAreaSymbol>
<o:ArchitectureAreaSymbol Id="o167">
<a:CreationDate>1697869396</a:CreationDate>
-<a:ModificationDate>1698115018</a:ModificationDate>
+<a:ModificationDate>1698283764</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-312558,98245), (-240253,164099))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
@@ -5702,9 +5702,9 @@
</o:ArchitectureAreaSymbol>
<o:ArchitectureAreaSymbol Id="o176">
<a:CreationDate>1696995172</a:CreationDate>
-<a:ModificationDate>1698046523</a:ModificationDate>
+<a:ModificationDate>1698283764</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-121456,214761), (-46921,278081))</a:Rect>
+<a:Rect>((-181024,186729), (-106489,250049))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>418425</a:LineColor>
<a:FillColor>15399421</a:FillColor>
@@ -5720,8 +5720,8 @@
<o:ReferenceSymbol Id="o177">
<a:CreationDate>1696479126</a:CreationDate>
<a:ModificationDate>1698127663</a:ModificationDate>
-<a:Rect>((-93243,250955), (-74307,252205))</a:Rect>
-<a:ListOfPoints>((-74707,251580),(-92843,251580))</a:ListOfPoints>
+<a:Rect>((-152811,222923), (-133875,224173))</a:Rect>
+<a:ListOfPoints>((-134275,223548),(-152411,223548))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5743,7 +5743,7 @@
<a:CreationDate>1696477823</a:CreationDate>
<a:ModificationDate>1698127663</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-108561,237382), (-92843,265778))</a:Rect>
+<a:Rect>((-168129,209350), (-152411,237746))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -5770,7 +5770,7 @@
<a:CreationDate>1696478624</a:CreationDate>
<a:ModificationDate>1698046523</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-74707,243544), (-52929,266234))</a:Rect>
+<a:Rect>((-134275,215512), (-112497,238202))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -5797,7 +5797,7 @@
<a:Text>鐐瑰嚮鍏ュ簱鏃跺皢淇℃伅瀛樺叆鐗╁搧璇︽儏銆佷繚绠¤褰曡〃锛屽悓鏃舵洿鏂拌繘鍑哄簱娴佹按</a:Text>
<a:CreationDate>1697874304</a:CreationDate>
<a:ModificationDate>1698124108</a:ModificationDate>
-<a:Rect>((-99110,273621), (-76791,268402))</a:Rect>
+<a:Rect>((-158678,245589), (-136359,240370))</a:Rect>
<a:FontColor>16777215</a:FontColor>
<a:TextStyle>4130</a:TextStyle>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
@@ -5814,9 +5814,9 @@
</o:ArchitectureAreaSymbol>
<o:ArchitectureAreaSymbol Id="o183">
<a:CreationDate>1697874587</a:CreationDate>
-<a:ModificationDate>1698046351</a:ModificationDate>
+<a:ModificationDate>1698283893</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-87221,86280), (-57117,132941))</a:Rect>
+<a:Rect>((-142584,9892), (-112480,56553))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>418425</a:LineColor>
<a:FillColor>15399421</a:FillColor>
@@ -5833,7 +5833,7 @@
<a:CreationDate>1696484331</a:CreationDate>
<a:ModificationDate>1698046351</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-80770,89787), (-61356,128015))</a:Rect>
+<a:Rect>((-136133,13399), (-116719,51627))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -5863,9 +5863,9 @@
</o:ArchitectureAreaSymbol>
<o:ArchitectureAreaSymbol Id="o186">
<a:CreationDate>1698032530</a:CreationDate>
-<a:ModificationDate>1698041038</a:ModificationDate>
+<a:ModificationDate>1698283764</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-212799,173195), (-157121,235887))</a:Rect>
+<a:Rect>((-222610,82091), (-166932,144783))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>418425</a:LineColor>
<a:FillColor>15399421</a:FillColor>
@@ -5882,7 +5882,7 @@
<a:CreationDate>1696835850</a:CreationDate>
<a:ModificationDate>1698040009</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-201888,191098), (-163062,225738))</a:Rect>
+<a:Rect>((-211699,99994), (-172873,134634))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>33023</a:FillColor>
@@ -5912,9 +5912,9 @@
</o:ArchitectureAreaSymbol>
<o:ArchitectureAreaSymbol Id="o189">
<a:CreationDate>1698033330</a:CreationDate>
-<a:ModificationDate>1698046399</a:ModificationDate>
+<a:ModificationDate>1698283767</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-57437,146584), (9268,210544))</a:Rect>
+<a:Rect>((10542,186882), (77247,250842))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>418425</a:LineColor>
<a:FillColor>15399421</a:FillColor>
@@ -5931,7 +5931,7 @@
<a:CreationDate>1696562511</a:CreationDate>
<a:ModificationDate>1698038791</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-46537,180993), (-27741,201981))</a:Rect>
+<a:Rect>((21442,221291), (40238,242279))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -5961,9 +5961,9 @@
</o:ArchitectureAreaSymbol>
<o:ArchitectureAreaSymbol Id="o192">
<a:CreationDate>1698037412</a:CreationDate>
-<a:ModificationDate>1698125050</a:ModificationDate>
+<a:ModificationDate>1698283787</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-210675,19788), (-134681,73693))</a:Rect>
+<a:Rect>((-77871,8225), (-1877,62200))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>418425</a:LineColor>
<a:FillColor>15399421</a:FillColor>
@@ -5979,8 +5979,8 @@
<o:ReferenceSymbol Id="o193">
<a:CreationDate>1697267671</a:CreationDate>
<a:ModificationDate>1698125130</a:ModificationDate>
-<a:Rect>((-186688,35164), (-168596,48365))</a:Rect>
-<a:ListOfPoints>((-168996,35564),(-186063,35564),(-186063,47965))</a:ListOfPoints>
+<a:Rect>((-53884,23601), (-35792,36802))</a:Rect>
+<a:ListOfPoints>((-36192,24001),(-53259,24001),(-53259,36402))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -6002,7 +6002,7 @@
<a:CreationDate>1697267525</a:CreationDate>
<a:ModificationDate>1698125130</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-168996,25699), (-144698,45429))</a:Rect>
+<a:Rect>((-36192,14136), (-11894,33866))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -6029,7 +6029,7 @@
<a:CreationDate>1696558477</a:CreationDate>
<a:ModificationDate>1698125129</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-195512,47965), (-176614,71363))</a:Rect>
+<a:Rect>((-62048,36402), (-44470,59800))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@@ -6057,9 +6057,9 @@
</o:ArchitectureAreaSymbol>
<o:ArchitectureAreaSymbol Id="o200">
<a:CreationDate>1698037413</a:CreationDate>
-<a:ModificationDate>1698125053</a:ModificationDate>
+<a:ModificationDate>1698283785</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-93454,13756), (-5066,74311))</a:Rect>
+<a:Rect>((13770,4997), (102158,65552))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>418425</a:LineColor>
<a:FillColor>15399421</a:FillColor>
@@ -6075,8 +6075,8 @@
<o:ReferenceSymbol Id="o201">
<a:CreationDate>1696999475</a:CreationDate>
<a:ModificationDate>1698125208</a:ModificationDate>
-<a:Rect>((-66400,34815), (-65150,46785))</a:Rect>
-<a:ListOfPoints>((-65775,35215),(-65775,46385))</a:ListOfPoints>
+<a:Rect>((40824,26056), (42074,38026))</a:Rect>
+<a:ListOfPoints>((41449,26456),(41449,37626))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -6098,7 +6098,7 @@
<a:CreationDate>1696858059</a:CreationDate>
<a:ModificationDate>1698125207</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-74902,46385), (-56648,67859))</a:Rect>
+<a:Rect>((32322,37626), (50576,59100))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@@ -6125,7 +6125,7 @@
<a:CreationDate>1696999318</a:CreationDate>
<a:ModificationDate>1698125208</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-80713,17817), (-43145,35215))</a:Rect>
+<a:Rect>((28465,9058), (62125,26456))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@@ -6529,7 +6529,7 @@
<a:Code>L_WH_FORM_TRANSFER</a:Code>
<a:CreationDate>1696484331</a:CreationDate>
<a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1698124967</a:ModificationDate>
+<a:ModificationDate>1698287819</a:ModificationDate>
<a:Modifier>cy</a:Modifier>
<a:Comment>璋冩嫧/鍒嗗彂鍗�</a:Comment>
<a:GlobalObjectID/>
@@ -6548,30 +6548,42 @@
<a:GlobalObjectID/>
</o:Column>
<o:Column Id="o236">
-<a:ObjectID>AF8CB276-B500-4EA4-9AFA-C0B017EF136B</a:ObjectID>
-<a:Name>杩涘嚭搴撴祦姘存�昏〃ID</a:Name>
-<a:Code>L_WAREHOUSE_FLOW_ID</a:Code>
-<a:CreationDate>1698124630</a:CreationDate>
+<a:ObjectID>2CFDE4EE-4AA7-43AD-9AF3-FB292AAF0FE6</a:ObjectID>
+<a:Name>鍑哄簱鍗曡〃涓� 鍏ュ簱鍗旾D</a:Name>
+<a:Code>IN_WAREHOUSE_FORM_ID</a:Code>
+<a:CreationDate>1698287560</a:CreationDate>
<a:Creator>cy</a:Creator>
-<a:ModificationDate>1698124694</a:ModificationDate>
+<a:ModificationDate>1698287739</a:ModificationDate>
<a:Modifier>cy</a:Modifier>
-<a:Comment>杩涘嚭搴撴祦姘存�昏〃ID</a:Comment>
+<a:Comment>鍑哄簱鍗曡〃涓� 鍏ュ簱鍗旾D</a:Comment>
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
<o:Column Id="o237">
-<a:ObjectID>C0AB800A-0527-43F5-812E-52283E62A8AB</a:ObjectID>
-<a:Name>鍗曟嵁绫诲瀷銆�0璋冩嫧锛�1鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��</a:Name>
-<a:Code>BUSINESS_TYPE</a:Code>
-<a:CreationDate>1698043545</a:CreationDate>
+<a:ObjectID>0D803010-0682-4FCF-8B5B-C9C14659E538</a:ObjectID>
+<a:Name>鍑哄簱鍗曡〃涓� 鍑哄簱鍗旾D</a:Name>
+<a:Code>OUT_WAREHOUSE_FORM_ID</a:Code>
+<a:CreationDate>1698287409</a:CreationDate>
<a:Creator>cy</a:Creator>
-<a:ModificationDate>1698124694</a:ModificationDate>
+<a:ModificationDate>1698287739</a:ModificationDate>
<a:Modifier>cy</a:Modifier>
-<a:Comment>鍗曟嵁绫诲瀷銆�0璋冩嫧锛�1鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��</a:Comment>
-<a:DataType>smallint</a:DataType>
+<a:Comment>鍑哄簱鍗曡〃涓� 鍑哄簱鍗旾D</a:Comment>
+<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
<o:Column Id="o238">
+<a:ObjectID>C0AB800A-0527-43F5-812E-52283E62A8AB</a:ObjectID>
+<a:Name>鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��</a:Name>
+<a:Code>BUSINESS_TYPE</a:Code>
+<a:CreationDate>1698043545</a:CreationDate>
+<a:Creator>cy</a:Creator>
+<a:ModificationDate>1698283707</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��</a:Comment>
+<a:DataType>smallint</a:DataType>
+<a:GlobalObjectID/>
+</o:Column>
+<o:Column Id="o239">
<a:ObjectID>8A3FDCBA-5AE6-405A-A2F1-1C357BCCA1DF</a:ObjectID>
<a:Name>璋冩嫧鍗曠紪鐮�</a:Name>
<a:Code>BUSINESS_FORM_CODE</a:Code>
@@ -6584,7 +6596,7 @@
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o239">
+<o:Column Id="o240">
<a:ObjectID>FC12329B-2092-4147-B37C-4E77CB551A5D</a:ObjectID>
<a:Name>鍏ュ簱浠撳簱缂栧彿</a:Name>
<a:Code>IN_WAREHOUSE_ID</a:Code>
@@ -6596,7 +6608,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o240">
+<o:Column Id="o241">
<a:ObjectID>9F5CD933-46CA-4C7E-9CDB-6D981A42F7B8</a:ObjectID>
<a:Name>鍏ュ簱浠撳簱鍚嶇О</a:Name>
<a:Code>IN_WAREHOUSE_NAME</a:Code>
@@ -6609,7 +6621,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o241">
+<o:Column Id="o242">
<a:ObjectID>5A4A01FF-8561-4FD6-AF9C-732F7FDBA965</a:ObjectID>
<a:Name>鍑哄簱浠撳簱缂栧彿</a:Name>
<a:Code>OUT_WAREHOUSE_ID</a:Code>
@@ -6621,7 +6633,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o242">
+<o:Column Id="o243">
<a:ObjectID>BD55EE93-E756-4D5E-A1DA-47DF5A7D25B5</a:ObjectID>
<a:Name>鍑哄簱浠撳簱鍚嶇О</a:Name>
<a:Code>OUT_WAREHOUSE_NAME</a:Code>
@@ -6634,7 +6646,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o243">
+<o:Column Id="o244">
<a:ObjectID>F1C4F7FD-69E2-4C31-8CF0-235CCA1D0984</a:ObjectID>
<a:Name>鍏ュ簱浠撳簱鏈烘瀯缂栧彿</a:Name>
<a:Code>IN_AGENCY_ID</a:Code>
@@ -6646,7 +6658,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o244">
+<o:Column Id="o245">
<a:ObjectID>933CA560-1A05-4015-BA18-63E49E8FBF7E</a:ObjectID>
<a:Name>鍏ュ簱浠撳簱鏈烘瀯鍚嶇О</a:Name>
<a:Code>IN_AGENCY_NAME</a:Code>
@@ -6659,7 +6671,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o245">
+<o:Column Id="o246">
<a:ObjectID>E62BD8F1-DE10-4845-BF36-68DE65226AEB</a:ObjectID>
<a:Name>鍑哄簱浠撳簱鏈烘瀯缂栧彿</a:Name>
<a:Code>OUT_AGENCY_ID</a:Code>
@@ -6671,7 +6683,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o246">
+<o:Column Id="o247">
<a:ObjectID>EDE72A09-8FB0-4DD7-94B1-C3F6EB5DC6E2</a:ObjectID>
<a:Name>鍑哄簱浠撳簱鏈烘瀯鍚嶇О</a:Name>
<a:Code>OUT_AGENCY_NAME</a:Code>
@@ -6684,7 +6696,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o247">
+<o:Column Id="o248">
<a:ObjectID>8C7410FA-4CF8-49D0-96BD-377450A26991</a:ObjectID>
<a:Name>鐢宠/棰嗗彇浜虹紪鍙�</a:Name>
<a:Code>OPERATOR_ID</a:Code>
@@ -6696,7 +6708,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o248">
+<o:Column Id="o249">
<a:ObjectID>D9393A3C-7A72-4908-88D1-966CA3A446A5</a:ObjectID>
<a:Name>鐢宠/棰嗗彇浜哄鍚�</a:Name>
<a:Code>OPERATOR_NAME</a:Code>
@@ -6709,7 +6721,7 @@
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o249">
+<o:Column Id="o250">
<a:ObjectID>507B0897-8D39-4FA0-A648-BE0B11478C5A</a:ObjectID>
<a:Name>鍒涘缓鏃堕棿</a:Name>
<a:Code>CREATE_TIME</a:Code>
@@ -6721,93 +6733,93 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o250">
+<o:Column Id="o251">
<a:ObjectID>14681C64-6CF3-4B16-9C15-3AC2EAB1377F</a:ObjectID>
<a:Name>鐘舵��</a:Name>
<a:Code>STATES</a:Code>
<a:CreationDate>1696484331</a:CreationDate>
<a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1697081934</a:ModificationDate>
-<a:Modifier>39886</a:Modifier>
-<a:Comment>0=瀹℃牳澶辫触锛�1=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴�</a:Comment>
+<a:ModificationDate>1698288280</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴�</a:Comment>
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o251">
+<o:Column Id="o252">
<a:ObjectID>E52DD56F-5964-4E9E-84E6-9C7958E189B9</a:ObjectID>
<a:Name>鍏ュ簱浜虹紪鍙�</a:Name>
-<a:Code>OPERATOR_ID3</a:Code>
+<a:Code>IN_OPERATOR_ID</a:Code>
<a:CreationDate>1696990745</a:CreationDate>
<a:Creator>asus</a:Creator>
-<a:ModificationDate>1696990935</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
-<a:Comment>閲囪喘浜虹紪鍙�</a:Comment>
+<a:ModificationDate>1698286492</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍏ュ簱浜虹紪鍙�</a:Comment>
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o252">
+<o:Column Id="o253">
<a:ObjectID>17DF934E-ED15-4FB6-A94D-DDAF6A0B0AB5</a:ObjectID>
<a:Name>鍏ュ簱浜哄鍚�</a:Name>
-<a:Code>OPERATOR_NAME3</a:Code>
+<a:Code>IN_OPERATOR_NAME</a:Code>
<a:CreationDate>1696990745</a:CreationDate>
<a:Creator>asus</a:Creator>
-<a:ModificationDate>1696990935</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
-<a:Comment>閲囪喘浜哄鍚�</a:Comment>
+<a:ModificationDate>1698286492</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍏ュ簱浜哄鍚�</a:Comment>
<a:DataType>varchar(32)</a:DataType>
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o253">
+<o:Column Id="o254">
<a:ObjectID>7A921B7E-0F67-41A6-A408-03EF44771359</a:ObjectID>
<a:Name>鍏ュ簱鏃堕棿</a:Name>
-<a:Code>INPUT_TIME</a:Code>
+<a:Code>IN_TIME</a:Code>
<a:CreationDate>1696990745</a:CreationDate>
<a:Creator>asus</a:Creator>
-<a:ModificationDate>1697698579</a:ModificationDate>
-<a:Modifier>Administrator</a:Modifier>
-<a:Comment>閲囪喘鏃堕棿</a:Comment>
-<a:DataType>bigint</a:DataType>
-<a:GlobalObjectID/>
-</o:Column>
-<o:Column Id="o254">
-<a:ObjectID>18696F3C-7A6C-491F-8796-0B230B4BEA53</a:ObjectID>
-<a:Name>鍑哄簱浜虹紪鍙�</a:Name>
-<a:Code>OPERATOR_ID2</a:Code>
-<a:CreationDate>1696484331</a:CreationDate>
-<a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1696990935</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
-<a:Comment>閲囪喘浜虹紪鍙�</a:Comment>
+<a:ModificationDate>1698286492</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍏ュ簱鏃堕棿</a:Comment>
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
<o:Column Id="o255">
-<a:ObjectID>2CA7470E-44FA-4FB6-B587-5E59F177B8D2</a:ObjectID>
-<a:Name>鍑哄簱浜哄鍚�</a:Name>
-<a:Code>OPERATOR_NAME2</a:Code>
+<a:ObjectID>18696F3C-7A6C-491F-8796-0B230B4BEA53</a:ObjectID>
+<a:Name>鍑哄簱浜虹紪鍙�</a:Name>
+<a:Code>OUT_OPERATOR_ID</a:Code>
<a:CreationDate>1696484331</a:CreationDate>
<a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1696990935</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
-<a:Comment>閲囪喘浜哄鍚�</a:Comment>
+<a:ModificationDate>1698286492</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍑哄簱浜虹紪鍙�</a:Comment>
+<a:DataType>bigint</a:DataType>
+<a:GlobalObjectID/>
+</o:Column>
+<o:Column Id="o256">
+<a:ObjectID>2CA7470E-44FA-4FB6-B587-5E59F177B8D2</a:ObjectID>
+<a:Name>鍑哄簱浜哄鍚�</a:Name>
+<a:Code>OUT_OPERATOR_NAME</a:Code>
+<a:CreationDate>1696484331</a:CreationDate>
+<a:Creator>Administrator</a:Creator>
+<a:ModificationDate>1698286492</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍑哄簱浜哄鍚�</a:Comment>
<a:DataType>varchar(32)</a:DataType>
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o256">
+<o:Column Id="o257">
<a:ObjectID>F3523B24-9024-4299-8A92-D509BFC78E9B</a:ObjectID>
<a:Name>鍑哄簱鏃堕棿</a:Name>
<a:Code>OUTPUT_TIME</a:Code>
<a:CreationDate>1696484331</a:CreationDate>
<a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1696990935</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
-<a:Comment>閲囪喘鏃堕棿</a:Comment>
+<a:ModificationDate>1698286492</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍑哄簱鏃堕棿</a:Comment>
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o257">
+<o:Column Id="o258">
<a:ObjectID>FD282285-93EA-4152-8B9D-E329810B50EB</a:ObjectID>
<a:Name>鐢宠澶囨敞</a:Name>
<a:Code>BEIZ1</a:Code>
@@ -6819,7 +6831,7 @@
<a:Length>2000</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o258">
+<o:Column Id="o259">
<a:ObjectID>679CA55A-604F-4112-8C80-367BDFCFFCA6</a:ObjectID>
<a:Name>鍑哄簱澶囨敞</a:Name>
<a:Code>BEIZ2</a:Code>
@@ -6831,7 +6843,7 @@
<a:Length>2000</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o259">
+<o:Column Id="o260">
<a:ObjectID>426AF79B-299B-4118-85D2-CF5459E38B3C</a:ObjectID>
<a:Name>鍏ュ簱澶囨敞</a:Name>
<a:Code>BEIZ3</a:Code>
@@ -6843,29 +6855,17 @@
<a:Length>2000</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o260">
+<o:Column Id="o261">
<a:ObjectID>F981EB10-2C80-4B83-A01B-15353228CFB3</a:ObjectID>
<a:Name>鎵嬬画</a:Name>
<a:Code>PROCURE_DOC</a:Code>
<a:CreationDate>1697081474</a:CreationDate>
<a:Creator>39886</a:Creator>
-<a:ModificationDate>1697081491</a:ModificationDate>
-<a:Modifier>39886</a:Modifier>
-<a:Comment>鎵嬬画锛堜笂浼狅級</a:Comment>
-<a:DataType>varchar(300)</a:DataType>
-<a:Length>300</a:Length>
-<a:GlobalObjectID/>
-</o:Column>
-<o:Column Id="o261">
-<a:ObjectID>87A70C17-30C2-455C-8C36-1A74A2C619A2</a:ObjectID>
-<a:Name>鍏宠仈鍑哄簱鍗旾D</a:Name>
-<a:Code>OUT_BUSINESS_ID</a:Code>
-<a:CreationDate>1698124933</a:CreationDate>
-<a:Creator>cy</a:Creator>
-<a:ModificationDate>1698124967</a:ModificationDate>
+<a:ModificationDate>1698286492</a:ModificationDate>
<a:Modifier>cy</a:Modifier>
-<a:Comment>鍏宠仈鍑哄簱鍗旾D</a:Comment>
-<a:DataType>bigint</a:DataType>
+<a:Comment>鎵嬬画锛堜笂浼狅級</a:Comment>
+<a:DataType>varchar(2000)</a:DataType>
+<a:Length>2000</a:Length>
<a:GlobalObjectID/>
</o:Column>
</c:Columns>
@@ -7144,7 +7144,7 @@
<a:Code>L_WH_FORM_OUTPUT</a:Code>
<a:CreationDate>1696562511</a:CreationDate>
<a:Creator>asus</a:Creator>
-<a:ModificationDate>1698124592</a:ModificationDate>
+<a:ModificationDate>1698284124</a:ModificationDate>
<a:Modifier>cy</a:Modifier>
<a:Comment>鍑哄簱鍗�</a:Comment>
<a:GlobalObjectID/>
@@ -7163,30 +7163,18 @@
<a:GlobalObjectID/>
</o:Column>
<o:Column Id="o283">
-<a:ObjectID>97432B27-8494-4187-BA74-18257BB259B9</a:ObjectID>
+<a:ObjectID>D8B72387-F512-42A6-A2D5-E7A5FF0996DB</a:ObjectID>
<a:Name>杩涘嚭搴撴祦姘存�昏〃ID</a:Name>
-<a:Code>L_WAREHOUSE_FLOW_ID</a:Code>
-<a:CreationDate>1698124567</a:CreationDate>
+<a:Code>WAREHOUSE_FLOW_ID</a:Code>
+<a:CreationDate>1698284090</a:CreationDate>
<a:Creator>cy</a:Creator>
-<a:ModificationDate>1698124592</a:ModificationDate>
+<a:ModificationDate>1698284124</a:ModificationDate>
<a:Modifier>cy</a:Modifier>
<a:Comment>杩涘嚭搴撴祦姘存�昏〃ID</a:Comment>
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
<o:Column Id="o284">
-<a:ObjectID>59DABB23-60A5-46CE-91B8-50B2ED7E28D3</a:ObjectID>
-<a:Name>璋冩嫧鍗旾D</a:Name>
-<a:Code>TRANS_BUSINESS_ID</a:Code>
-<a:CreationDate>1698037764</a:CreationDate>
-<a:Creator>cy</a:Creator>
-<a:ModificationDate>1698125007</a:ModificationDate>
-<a:Modifier>cy</a:Modifier>
-<a:Comment>璋冩嫧鍗旾D</a:Comment>
-<a:DataType>bigint</a:DataType>
-<a:GlobalObjectID/>
-</o:Column>
-<o:Column Id="o285">
<a:ObjectID>048CAC90-A231-4754-894C-D0CD6A6D5466</a:ObjectID>
<a:Name>鍑哄簱鍗曠紪鐮�</a:Name>
<a:Code>BUSINESS_FORM_CODE</a:Code>
@@ -7199,7 +7187,57 @@
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
+<o:Column Id="o285">
+<a:ObjectID>97432B27-8494-4187-BA74-18257BB259B9</a:ObjectID>
+<a:Name>杩涘嚭搴撴祦姘存�昏〃 鍏ュ簱鍗旾D</a:Name>
+<a:Code>IN_WAREHOUSE_FLOW_ID</a:Code>
+<a:CreationDate>1698124567</a:CreationDate>
+<a:Creator>cy</a:Creator>
+<a:ModificationDate>1698282964</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>杩涘嚭搴撴祦姘存�昏〃 鍏ュ簱鍗旾D</a:Comment>
+<a:DataType>bigint</a:DataType>
+<a:GlobalObjectID/>
+</o:Column>
<o:Column Id="o286">
+<a:ObjectID>59DABB23-60A5-46CE-91B8-50B2ED7E28D3</a:ObjectID>
+<a:Name>璋冩嫧鍗旾D(璋冩嫧鏃堕渶瑕�)</a:Name>
+<a:Code>TRANS_BUSINESS_ID</a:Code>
+<a:CreationDate>1698037764</a:CreationDate>
+<a:Creator>cy</a:Creator>
+<a:ModificationDate>1698283504</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>璋冩嫧鍗旾D(璋冩嫧鏃堕渶瑕�)</a:Comment>
+<a:DataType>bigint</a:DataType>
+<a:GlobalObjectID/>
+</o:Column>
+<o:Column Id="o287">
+<a:ObjectID>7148759F-99E9-4FAD-B7A6-9CB7DA987486</a:ObjectID>
+<a:Name>鍑哄簱绫诲瀷缂栫爜</a:Name>
+<a:Code>OUTPUT_CODE</a:Code>
+<a:CreationDate>1698283331</a:CreationDate>
+<a:Creator>cy</a:Creator>
+<a:ModificationDate>1698283504</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍑哄簱绫诲瀷缂栫爜</a:Comment>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:GlobalObjectID/>
+</o:Column>
+<o:Column Id="o288">
+<a:ObjectID>7AD3A177-DB9C-4E2A-A35F-07DCDEAD4AF5</a:ObjectID>
+<a:Name>鍑哄簱绫诲瀷鍚嶇О</a:Name>
+<a:Code>OUTPUT_NAME</a:Code>
+<a:CreationDate>1698283331</a:CreationDate>
+<a:Creator>cy</a:Creator>
+<a:ModificationDate>1698283504</a:ModificationDate>
+<a:Modifier>cy</a:Modifier>
+<a:Comment>鍑哄簱绫诲瀷鍚嶇О</a:Comment>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:GlobalObjectID/>
+</o:Column>
+<o:Column Id="o289">
<a:ObjectID>50391500-B79F-4C8B-8C38-F9E7011DF35D</a:ObjectID>
<a:Name>浠撳簱缂栧彿</a:Name>
<a:Code>WAREHOUSE_ID</a:Code>
@@ -7211,7 +7249,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o287">
+<o:Column Id="o290">
<a:ObjectID>A4B4902D-2BA0-4F8B-8F54-89945D6C685D</a:ObjectID>
<a:Name>浠撳簱鍚嶇О</a:Name>
<a:Code>WAREHOUSE_NAME</a:Code>
@@ -7224,7 +7262,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o288">
+<o:Column Id="o291">
<a:ObjectID>FA334561-0AB0-4D40-A07C-EE1FD62E5EA0</a:ObjectID>
<a:Name>鏈烘瀯缂栧彿</a:Name>
<a:Code>AGENCY_ID</a:Code>
@@ -7235,7 +7273,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o289">
+<o:Column Id="o292">
<a:ObjectID>437C65C0-FA19-4C06-8710-50716969F6CF</a:ObjectID>
<a:Name>鏈烘瀯鍚嶇О</a:Name>
<a:Code>AGENCY_NAME</a:Code>
@@ -7247,7 +7285,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o290">
+<o:Column Id="o293">
<a:ObjectID>E80A2C6F-CFD3-4754-A6A7-E8E157148BD7</a:ObjectID>
<a:Name>鎿嶄綔浜虹紪鍙�</a:Name>
<a:Code>OPERATOR_ID</a:Code>
@@ -7259,7 +7297,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o291">
+<o:Column Id="o294">
<a:ObjectID>39A522D8-CAB3-400E-976C-845CA3C9BE2E</a:ObjectID>
<a:Name>鎿嶄綔浜哄鍚�</a:Name>
<a:Code>OPERATOR_NAME</a:Code>
@@ -7272,7 +7310,7 @@
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o292">
+<o:Column Id="o295">
<a:ObjectID>0EA33CAC-F69A-4FDC-A9CE-0C57C9ED6B3D</a:ObjectID>
<a:Name>鎿嶄綔鏃堕棿</a:Name>
<a:Code>DEAL_TIME</a:Code>
@@ -7284,7 +7322,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o293">
+<o:Column Id="o296">
<a:ObjectID>2DC59773-388E-49FA-A77E-642A3DD65721</a:ObjectID>
<a:Name>鐘舵��</a:Name>
<a:Code>STATES</a:Code>
@@ -7296,7 +7334,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o294">
+<o:Column Id="o297">
<a:ObjectID>C5F5C00B-EECA-47C6-92CE-16CA39651B61</a:ObjectID>
<a:Name>澶囨敞</a:Name>
<a:Code>BEIZ</a:Code>
@@ -7308,35 +7346,9 @@
<a:Length>2000</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o295">
-<a:ObjectID>8F4D6B40-6AC4-4E72-9627-BFF2086A326F</a:ObjectID>
-<a:Name>鍑哄簱绫诲埆CODE</a:Name>
-<a:Code>OUTPUT_CODE</a:Code>
-<a:CreationDate>1696565714</a:CreationDate>
-<a:Creator>asus</a:Creator>
-<a:ModificationDate>1696565758</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
-<a:Comment>鍑哄簱绫诲埆CODE锛屾暟鎹瓧鍏�</a:Comment>
-<a:DataType>varchar(100)</a:DataType>
-<a:Length>100</a:Length>
-<a:GlobalObjectID/>
-</o:Column>
-<o:Column Id="o296">
-<a:ObjectID>7E65C60E-96F2-4C76-AE56-00FF25CB3DEB</a:ObjectID>
-<a:Name>鍑哄簱绫诲埆NAME</a:Name>
-<a:Code>OUTPUT_NAME</a:Code>
-<a:CreationDate>1696565714</a:CreationDate>
-<a:Creator>asus</a:Creator>
-<a:ModificationDate>1696565758</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
-<a:Comment>鍑哄簱绫诲埆NAME锛屾暟鎹瓧鍏�</a:Comment>
-<a:DataType>varchar(100)</a:DataType>
-<a:Length>100</a:Length>
-<a:GlobalObjectID/>
-</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o297">
+<o:Key Id="o298">
<a:ObjectID>2E347FC0-F9D4-40BF-916A-CC11D0E828C2</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -7351,7 +7363,7 @@
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o297"/>
+<o:Key Ref="o298"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o187">
@@ -7366,7 +7378,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o298">
+<o:Column Id="o299">
<a:ObjectID>368EE1DB-D7AB-498E-A9E2-F89C1F687419</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -7378,7 +7390,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o299">
+<o:Column Id="o300">
<a:ObjectID>FAF1A592-AC05-436B-BB10-8F72BC11F536</a:ObjectID>
<a:Name>閲囪喘鍗曠墿鍝佽〃ID(鍗曟嵁绫诲瀷涓�1鎵嶉渶瑕佽褰�)</a:Name>
<a:Code>FROM_PROCURE_GOODS_ID</a:Code>
@@ -7390,7 +7402,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o300">
+<o:Column Id="o301">
<a:ObjectID>963D3813-1E05-4C04-A278-97D58F0171A5</a:ObjectID>
<a:Name>鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂</a:Name>
<a:Code>BUSINESS_TYPE</a:Code>
@@ -7402,7 +7414,7 @@
<a:DataType>smallint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o301">
+<o:Column Id="o302">
<a:ObjectID>4E01EE4F-EC83-4876-A368-DBC8A19F705D</a:ObjectID>
<a:Name>閲囪喘鍗曠墿鍝両D/璋冩嫧鍗旾D/鍑哄簱鍗昳d</a:Name>
<a:Code>BUSINESS_ID</a:Code>
@@ -7414,7 +7426,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o302">
+<o:Column Id="o303">
<a:ObjectID>997EB6F8-A3B7-4D85-AEB3-3025343455A8</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿缂栧彿</a:Name>
<a:Code>BASE_GOODS_MODELS_ID</a:Code>
@@ -7426,7 +7438,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o303">
+<o:Column Id="o304">
<a:ObjectID>3111744D-6F33-4FDF-95CA-C6907FA22606</a:ObjectID>
<a:Name>鍗曚环(閲囪喘闇�瑕侊紝璋冩嫧涓嶉渶瑕�)</a:Name>
<a:Code>PRICE</a:Code>
@@ -7438,7 +7450,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o304">
+<o:Column Id="o305">
<a:ObjectID>8727D918-4358-46B5-A93C-70E1A6EC9627</a:ObjectID>
<a:Name>鎿嶄綔鏁伴噺</a:Name>
<a:Code>COUNTS</a:Code>
@@ -7450,7 +7462,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o305">
+<o:Column Id="o306">
<a:ObjectID>503BED7B-D32A-4E26-A043-4F3963BF8C14</a:ObjectID>
<a:Name>搴撳瓨鏁伴噺</a:Name>
<a:Code>WOREHOUSE_COUNT</a:Code>
@@ -7462,7 +7474,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o306">
+<o:Column Id="o307">
<a:ObjectID>49E69E8A-8009-4226-A02E-28DA768D66E4</a:ObjectID>
<a:Name>渚涘簲鍟�</a:Name>
<a:Code>SUPPLIER</a:Code>
@@ -7477,7 +7489,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o307">
+<o:Key Id="o308">
<a:ObjectID>3AE696B5-4397-496F-AAEE-8DD54A1F22AA</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -7487,12 +7499,12 @@
<a:Modifier>asus</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o298"/>
+<o:Column Ref="o299"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o308"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o205">
@@ -7507,7 +7519,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o308">
+<o:Column Id="o309">
<a:ObjectID>F6B4D663-AC20-4915-BF46-B1A6E362D6C7</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -7519,7 +7531,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o309">
+<o:Column Id="o310">
<a:ObjectID>AEAC61FC-E4D8-49C5-A8AA-F8A6330361C0</a:ObjectID>
<a:Name>杩涘嚭搴撴祦姘存�昏〃ID</a:Name>
<a:Code>L_WAREHOUSE_FLOW_ID</a:Code>
@@ -7531,7 +7543,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o310">
+<o:Column Id="o311">
<a:ObjectID>34EA8044-D51A-45DF-ADA0-658BABA5705C</a:ObjectID>
<a:Name>鎶ュ簾鍗曠紪鐮�</a:Name>
<a:Code>BUSINESS_FORM_CODE</a:Code>
@@ -7544,7 +7556,7 @@
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o311">
+<o:Column Id="o312">
<a:ObjectID>6153EAE2-33D3-41CA-8CB3-CF4232F74332</a:ObjectID>
<a:Name>浠撳簱缂栧彿</a:Name>
<a:Code>WAREHOUSE_ID</a:Code>
@@ -7556,7 +7568,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o312">
+<o:Column Id="o313">
<a:ObjectID>4AD84C6D-F8AB-4A1E-87E6-58297DFB9998</a:ObjectID>
<a:Name>浠撳簱鍚嶇О</a:Name>
<a:Code>WAREHOUSE_NAME</a:Code>
@@ -7569,7 +7581,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o313">
+<o:Column Id="o314">
<a:ObjectID>1DB31041-4C7A-4A87-8D3F-216948806278</a:ObjectID>
<a:Name>绫诲瀷0鏈烘瀯1閮ㄩ棬</a:Name>
<a:Code>SCRAPPED_TYPE</a:Code>
@@ -7581,7 +7593,7 @@
<a:DataType>smallint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o314">
+<o:Column Id="o315">
<a:ObjectID>E737D7FA-AECF-4D48-93D0-C65A4A705E2D</a:ObjectID>
<a:Name>鏈烘瀯/閮ㄩ棬缂栧彿</a:Name>
<a:Code>AGENCY_ID</a:Code>
@@ -7593,7 +7605,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o315">
+<o:Column Id="o316">
<a:ObjectID>BA2B5846-9039-4C5F-9F7C-1B687073242B</a:ObjectID>
<a:Name>鏈烘瀯/閮ㄩ棬鍚嶇О</a:Name>
<a:Code>AGENCY_NAME</a:Code>
@@ -7606,7 +7618,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o316">
+<o:Column Id="o317">
<a:ObjectID>D7BD6817-BC5F-46BD-AE4A-2023386897C7</a:ObjectID>
<a:Name>鎿嶄綔浜虹紪鍙�</a:Name>
<a:Code>OPERATOR_ID</a:Code>
@@ -7618,7 +7630,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o317">
+<o:Column Id="o318">
<a:ObjectID>EEC89E28-59D4-4141-805A-8728D04AFF53</a:ObjectID>
<a:Name>鎿嶄綔浜哄鍚�</a:Name>
<a:Code>OPERATOR_NAME</a:Code>
@@ -7631,7 +7643,7 @@
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o318">
+<o:Column Id="o319">
<a:ObjectID>BA40B97D-5528-49D3-876C-0FE41945DB7B</a:ObjectID>
<a:Name>鎿嶄綔鏃堕棿</a:Name>
<a:Code>DEAL_TIME</a:Code>
@@ -7643,7 +7655,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o319">
+<o:Column Id="o320">
<a:ObjectID>3E1BB416-3AB8-4FB2-B4AC-3784B142D4C8</a:ObjectID>
<a:Name>鎿嶄綔浜洪儴闂ㄥ悕绉�</a:Name>
<a:Code>DEPARTMENT_ID</a:Code>
@@ -7656,7 +7668,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o320">
+<o:Column Id="o321">
<a:ObjectID>730C1618-A2A9-4AC2-832B-67F35E8FF392</a:ObjectID>
<a:Name>鎿嶄綔浜洪儴闂ㄧ紪鍙�</a:Name>
<a:Code>DEPARTMENT_NAME</a:Code>
@@ -7668,7 +7680,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o321">
+<o:Column Id="o322">
<a:ObjectID>DFC62409-C3C2-4418-B82C-1CBE91637EA7</a:ObjectID>
<a:Name>闄勪欢</a:Name>
<a:Code>UPLOAD_FILES</a:Code>
@@ -7683,7 +7695,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o322">
+<o:Key Id="o323">
<a:ObjectID>88AC6223-71F8-4B4E-9803-88A399642E91</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -7693,12 +7705,12 @@
<a:Modifier>asus</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o308"/>
+<o:Column Ref="o309"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o322"/>
+<o:Key Ref="o323"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o172">
@@ -7713,7 +7725,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o323">
+<o:Column Id="o324">
<a:ObjectID>0FE14808-926C-4999-B38A-B78E0A8F8189</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -7725,7 +7737,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o324">
+<o:Column Id="o325">
<a:ObjectID>1966965A-BB34-41E0-88C3-0DD4881EA550</a:ObjectID>
<a:Name>浠撳簱缂栧彿</a:Name>
<a:Code>WAREHOUSE_ID</a:Code>
@@ -7737,7 +7749,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o325">
+<o:Column Id="o326">
<a:ObjectID>82A135A6-B57F-444A-95F0-563299A21B35</a:ObjectID>
<a:Name>杩涘嚭搴撴祦姘存�昏〃ID</a:Name>
<a:Code>WAREHOUSE_FLOW_ID</a:Code>
@@ -7749,7 +7761,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o326">
+<o:Column Id="o327">
<a:ObjectID>CD29D3BC-6F92-442B-9904-084ED5B3DF18</a:ObjectID>
<a:Name>鏈熷垵鏁伴噺</a:Name>
<a:Code>INITIAL_COUNT</a:Code>
@@ -7761,7 +7773,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o327">
+<o:Column Id="o328">
<a:ObjectID>7F0B2E99-7BC5-44E5-BA7E-6FADC89E9DA2</a:ObjectID>
<a:Name>鏈璋冩暣绫诲瀷</a:Name>
<a:Code>THIS_TYPE</a:Code>
@@ -7773,7 +7785,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o328">
+<o:Column Id="o329">
<a:ObjectID>072D4DBA-04E3-4C71-B720-D3C1CFB1FF90</a:ObjectID>
<a:Name>鏈杩涘嚭鏁伴噺</a:Name>
<a:Code>THIS_COUNT</a:Code>
@@ -7785,7 +7797,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o329">
+<o:Column Id="o330">
<a:ObjectID>6ABA5814-B472-483A-84FE-026F8E80C50C</a:ObjectID>
<a:Name>鏈熸湯鏁伴噺</a:Name>
<a:Code>END_COUNT</a:Code>
@@ -7797,7 +7809,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o330">
+<o:Column Id="o331">
<a:ObjectID>D3587088-FD22-4900-A662-5A41A805E976</a:ObjectID>
<a:Name>鐗╁搧妯＄増缂栧彿</a:Name>
<a:Code>BASE_GOODS_TEMPLATE_ID</a:Code>
@@ -7809,7 +7821,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o331">
+<o:Column Id="o332">
<a:ObjectID>D9951853-2C85-45DA-99D7-8D1DAA69B150</a:ObjectID>
<a:Name>鐗╁搧妯＄増鍚嶇О</a:Name>
<a:Code>GOODS_TEMPLATE_NAME</a:Code>
@@ -7822,7 +7834,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o332">
+<o:Column Id="o333">
<a:ObjectID>6E870326-522E-4F11-B5BF-6FF1910D5579</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿缂栧彿</a:Name>
<a:Code>BASE_GOODS_MODELS_ID</a:Code>
@@ -7834,7 +7846,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o333">
+<o:Column Id="o334">
<a:ObjectID>20D7AF06-2B7F-46CA-A801-1176187F95EA</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿鍚嶇О</a:Name>
<a:Code>BASE_GOODS_MODELS_NAME</a:Code>
@@ -7847,7 +7859,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o334">
+<o:Column Id="o335">
<a:ObjectID>F9BE096C-5811-48F0-8E4A-491F16F4729F</a:ObjectID>
<a:Name>鎿嶄綔鏃堕棿</a:Name>
<a:Code>DEAL_TIME</a:Code>
@@ -7861,7 +7873,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o335">
+<o:Key Id="o336">
<a:ObjectID>17804BFA-8E23-4982-A982-26025B0D78DE</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -7871,12 +7883,12 @@
<a:Modifier>asus</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o323"/>
+<o:Column Ref="o324"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o335"/>
+<o:Key Ref="o336"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o206">
@@ -7890,7 +7902,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o336">
+<o:Column Id="o337">
<a:ObjectID>B468A6EF-DA54-467C-9151-1AC9F88E9A6B</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -7902,7 +7914,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o337">
+<o:Column Id="o338">
<a:ObjectID>166365BC-0358-4912-AAA0-2A3B2E56777E</a:ObjectID>
<a:Name>鏁伴噺</a:Name>
<a:Code>COUNTS</a:Code>
@@ -7914,7 +7926,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o338">
+<o:Column Id="o339">
<a:ObjectID>F320C2A2-C2D7-43F8-B7E9-95E2E703A921</a:ObjectID>
<a:Name>鎶ュ簾鍘熷洜CODE</a:Name>
<a:Code>SCRAPPED_CODE</a:Code>
@@ -7927,7 +7939,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o339">
+<o:Column Id="o340">
<a:ObjectID>9206D23C-2025-4ED7-BCD2-95B921C05A7B</a:ObjectID>
<a:Name>鎶ュ簾鍘熷洜NAME</a:Name>
<a:Code>SCRAPPED_NAME</a:Code>
@@ -7940,7 +7952,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o340">
+<o:Column Id="o341">
<a:ObjectID>3D188B73-629D-49CD-8F5B-D03AF325E971</a:ObjectID>
<a:Name>澶囨敞</a:Name>
<a:Code>BEIZ</a:Code>
@@ -7953,7 +7965,7 @@
<a:Length>2000</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o341">
+<o:Column Id="o342">
<a:ObjectID>A341D6D6-AD7D-4711-8DAD-1C0F53CF6818</a:ObjectID>
<a:Name>鎶ュ簾鍗曠紪鍙�</a:Name>
<a:Code>DEP_FORM_SCRAPPED_ID</a:Code>
@@ -7965,7 +7977,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o342">
+<o:Column Id="o343">
<a:ObjectID>0C5A7398-46CF-4DAE-9094-E24D26168CA2</a:ObjectID>
<a:Name>鐗╁搧妯＄増缂栧彿</a:Name>
<a:Code>BASE_GOODS_TEMPLATE_ID</a:Code>
@@ -7977,7 +7989,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o343">
+<o:Column Id="o344">
<a:ObjectID>EFC2C5F4-4DF5-4A1B-A932-088C6FDDDEEB</a:ObjectID>
<a:Name>鐗╁搧妯＄増鍚嶇О</a:Name>
<a:Code>GOODS_TEMPLATE_NAME</a:Code>
@@ -7990,7 +8002,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o344">
+<o:Column Id="o345">
<a:ObjectID>3B5C7C42-8317-4210-8C6E-463B0A9CC425</a:ObjectID>
<a:Name>璁￠噺鍗曚綅</a:Name>
<a:Code>UNIT</a:Code>
@@ -8003,7 +8015,7 @@
<a:Length>10</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o345">
+<o:Column Id="o346">
<a:ObjectID>3A80F4B6-3DE2-4598-BA3C-0676FB3F68F5</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿缂栧彿</a:Name>
<a:Code>BASE_GOODS_MODELS_ID</a:Code>
@@ -8015,7 +8027,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o346">
+<o:Column Id="o347">
<a:ObjectID>C9B5208B-8F0A-4FD5-9917-EC1BF9E6E3A2</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿鍚嶇О</a:Name>
<a:Code>BASE_GOODS_MODELS_NAME</a:Code>
@@ -8028,7 +8040,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o347">
+<o:Column Id="o348">
<a:ObjectID>B572E100-7B85-4936-A3A1-AB60F0B87786</a:ObjectID>
<a:Name>搴撳瓨鐗╁搧璇︽儏IDs,鐗╁搧瑙勬牸鍨嬪彿 鎴栬�� id锛屽繀椤婚�夋嫨鍏朵竴</a:Name>
<a:Code>搴撳瓨鐗╁搧璇︽儏IDs,鐗╁搧瑙勬牸鍨嬪彿 鎴栬�� id锛屽繀椤婚�夋嫨鍏朵竴</a:Code>
@@ -8041,7 +8053,7 @@
<a:Length>2000</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o348">
+<o:Column Id="o349">
<a:ObjectID>F0C7EEBE-22E1-4C83-B564-446160874CA8</a:ObjectID>
<a:Name>椤哄簭</a:Name>
<a:Code>SORT</a:Code>
@@ -8055,7 +8067,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o349">
+<o:Key Id="o350">
<a:ObjectID>34554B12-AAA9-427A-98E9-C28AE724E801</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -8065,12 +8077,12 @@
<a:Modifier>asus</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o336"/>
+<o:Column Ref="o337"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o349"/>
+<o:Key Ref="o350"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o197">
@@ -8084,7 +8096,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o350">
+<o:Column Id="o351">
<a:ObjectID>47EE8040-11B8-4025-BEC2-E18A70C23E7C</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -8096,7 +8108,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o351">
+<o:Column Id="o352">
<a:ObjectID>20E569D8-AF86-4C3B-93D3-4AC63077F90A</a:ObjectID>
<a:Name>鐩樼偣鍗曠紪鍙�</a:Name>
<a:Code>WH_FORM_INVENTORY_ID</a:Code>
@@ -8108,7 +8120,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o352">
+<o:Column Id="o353">
<a:ObjectID>77913576-6C01-4768-B21F-A058EDC22214</a:ObjectID>
<a:Name>鐗╁搧妯＄増缂栧彿</a:Name>
<a:Code>BASE_GOODS_TEMPLATE_ID</a:Code>
@@ -8120,7 +8132,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o353">
+<o:Column Id="o354">
<a:ObjectID>B105ABE7-C914-4230-97D1-C6411E6AC70C</a:ObjectID>
<a:Name>鐗╁搧妯＄増鍚嶇О</a:Name>
<a:Code>GOODS_TEMPLATE_NAME</a:Code>
@@ -8133,7 +8145,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o354">
+<o:Column Id="o355">
<a:ObjectID>D5A68808-F7D5-42DD-B21D-76C2EF47E819</a:ObjectID>
<a:Name>璁￠噺鍗曚綅</a:Name>
<a:Code>UNIT</a:Code>
@@ -8146,7 +8158,7 @@
<a:Length>10</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o355">
+<o:Column Id="o356">
<a:ObjectID>022BFB4F-5C23-4C5F-A700-D1A3827F1017</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿缂栧彿</a:Name>
<a:Code>BASE_GOODS_MODELS_ID</a:Code>
@@ -8158,7 +8170,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o356">
+<o:Column Id="o357">
<a:ObjectID>F2BD2B68-4CBB-4CBC-B46F-5939A7A4B568</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿鍚嶇О</a:Name>
<a:Code>BASE_GOODS_MODELS_NAME</a:Code>
@@ -8171,7 +8183,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o357">
+<o:Column Id="o358">
<a:ObjectID>47EB25F5-968D-4309-999A-DCCEFF95F279</a:ObjectID>
<a:Name>閲囪喘鍗曚环</a:Name>
<a:Code>PRICE</a:Code>
@@ -8183,7 +8195,7 @@
<a:DataType>double</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o358">
+<o:Column Id="o359">
<a:ObjectID>3DB5F4EF-2C8C-47D8-BE15-84CE37626F69</a:ObjectID>
<a:Name>鏈熷垵鏁伴噺</a:Name>
<a:Code>INIT_COUNTS</a:Code>
@@ -8195,7 +8207,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o359">
+<o:Column Id="o360">
<a:ObjectID>9667048E-EC9F-4CE1-B78E-0810CC0FAD3D</a:ObjectID>
<a:Name>鐩樼偣鏁伴噺</a:Name>
<a:Code>INVENTORY_COUNTS</a:Code>
@@ -8207,7 +8219,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o360">
+<o:Column Id="o361">
<a:ObjectID>FC1691D3-4264-4D1B-98DD-B5BF933956CB</a:ObjectID>
<a:Name>宸紓鏁伴噺</a:Name>
<a:Code>ERROR_COUNTS</a:Code>
@@ -8219,7 +8231,7 @@
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o361">
+<o:Column Id="o362">
<a:ObjectID>AAA6B85A-D53E-4716-B8C6-3D1EEBF259C4</a:ObjectID>
<a:Name>鐩樼偣缁撴灉</a:Name>
<a:Code>INVENTORY_RESULT</a:Code>
@@ -8233,7 +8245,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o362">
+<o:Key Id="o363">
<a:ObjectID>BD301CB1-232D-4D34-A26B-0A8D951B5C27</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -8243,12 +8255,12 @@
<a:Modifier>39886</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o350"/>
+<o:Column Ref="o351"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o362"/>
+<o:Key Ref="o363"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o164">
@@ -8264,7 +8276,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o363">
+<o:Column Id="o364">
<a:ObjectID>FB0CD68A-F40C-4A33-A0EA-227105147883</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -8277,7 +8289,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o364">
+<o:Column Id="o365">
<a:ObjectID>9C8B80E9-70B0-401F-987D-4497324D41A7</a:ObjectID>
<a:Name>鎵�灞炰粨搴撲粨搴撶紪鍙�</a:Name>
<a:Code>WAREHOUSE_ID</a:Code>
@@ -8289,7 +8301,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o365">
+<o:Column Id="o366">
<a:ObjectID>AF42D1A7-F0AD-4FBF-9B5B-6475C0F99EEB</a:ObjectID>
<a:Name>浠撳簱鍚嶇О</a:Name>
<a:Code>WAREHOUSE_NAME</a:Code>
@@ -8302,7 +8314,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o366">
+<o:Column Id="o367">
<a:ObjectID>31B11685-5373-4571-8872-8C9111AEF0C7</a:ObjectID>
<a:Name>浠峰�肩被鍨�</a:Name>
<a:Code>COST_TYPE</a:Code>
@@ -8314,7 +8326,7 @@
<a:DataType>smallint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o367">
+<o:Column Id="o368">
<a:ObjectID>8F50FC5D-47E6-4600-A744-35C0F87557E4</a:ObjectID>
<a:Name>鐗╁搧妯＄増缂栧彿</a:Name>
<a:Code>BASE_GOODS_TEMPLATE_ID</a:Code>
@@ -8326,7 +8338,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o368">
+<o:Column Id="o369">
<a:ObjectID>3EE7D003-9ABE-47C6-987F-3E65AE6E7ED0</a:ObjectID>
<a:Name>鐗╁搧妯＄増鍚嶇О</a:Name>
<a:Code>GOODS_TEMPLATE_NAME</a:Code>
@@ -8339,7 +8351,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o369">
+<o:Column Id="o370">
<a:ObjectID>5E4854DF-745A-4B3E-BBE9-845940927E74</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿缂栧彿</a:Name>
<a:Code>BASE_GOODS_MODELS_ID</a:Code>
@@ -8351,7 +8363,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o370">
+<o:Column Id="o371">
<a:ObjectID>5F39D30A-E162-430D-B17B-A23CA5DD36A8</a:ObjectID>
<a:Name>瑙勬牸鍨嬪彿鍚嶇О</a:Name>
<a:Code>BASE_GOODS_MODELS_NAME</a:Code>
@@ -8364,7 +8376,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o371">
+<o:Column Id="o372">
<a:ObjectID>C6557AAF-4976-4454-9CBC-E486877DAB23</a:ObjectID>
<a:Name>渚涘簲鍟�</a:Name>
<a:Code>SUPPLIER</a:Code>
@@ -8377,7 +8389,7 @@
<a:Length>200</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o372">
+<o:Column Id="o373">
<a:ObjectID>512AA92C-2CEF-462F-ACDB-DB25569A5BF2</a:ObjectID>
<a:Name>閲囪喘鏂瑰紡</a:Name>
<a:Code>BUY_TYPE</a:Code>
@@ -8389,7 +8401,7 @@
<a:DataType>smallint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o373">
+<o:Column Id="o374">
<a:ObjectID>2094ACE4-DAAA-4C89-B9F2-3256BE75B525</a:ObjectID>
<a:Name>璁￠噺鍗曚綅</a:Name>
<a:Code>UNIT</a:Code>
@@ -8402,7 +8414,7 @@
<a:Length>10</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o374">
+<o:Column Id="o375">
<a:ObjectID>0ACD1E18-E191-4DC7-8C8B-F11DD20328CE</a:ObjectID>
<a:Name>閲囪喘鍗曚环</a:Name>
<a:Code>PRICE</a:Code>
@@ -8414,7 +8426,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o375">
+<o:Column Id="o376">
<a:ObjectID>1205FE5B-0F6B-4D3A-8E6D-27A4E8580F2C</a:ObjectID>
<a:Name>閲囪喘鏃堕棿</a:Name>
<a:Code>PROCURE_DATE</a:Code>
@@ -8426,7 +8438,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o376">
+<o:Column Id="o377">
<a:ObjectID>FFD7AD7F-2649-4248-AEF1-98C45140F37A</a:ObjectID>
<a:Name>鐘舵��</a:Name>
<a:Code>STATES</a:Code>
@@ -8440,7 +8452,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o377">
+<o:Key Id="o378">
<a:ObjectID>2E6E2565-85F9-434C-BE7A-07258CB379BF</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -8450,12 +8462,12 @@
<a:Modifier>cy</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o363"/>
+<o:Column Ref="o364"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o377"/>
+<o:Key Ref="o378"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o163">
@@ -8470,7 +8482,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o378">
+<o:Column Id="o379">
<a:ObjectID>C3C2B29C-4ADD-43DF-9888-FF977249759D</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -8482,7 +8494,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o379">
+<o:Column Id="o380">
<a:ObjectID>008F9C93-1FAE-41A1-AF4D-D1FF880C2B48</a:ObjectID>
<a:Name>搴撳瓨鐗╁搧璇︽儏琛↖d</a:Name>
<a:Code>GOODS_USER_PHONE</a:Code>
@@ -8494,7 +8506,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o380">
+<o:Column Id="o381">
<a:ObjectID>13D7806D-73F2-47FE-BBE6-03662029214B</a:ObjectID>
<a:Name>绫诲瀷0鍒嗗彂浣跨敤1 杩斿簱</a:Name>
<a:Code>RECORD_TYPE</a:Code>
@@ -8506,7 +8518,7 @@
<a:DataType>smallint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o381">
+<o:Column Id="o382">
<a:ObjectID>C56F4D87-180F-4C3F-9101-407C1250D6D3</a:ObjectID>
<a:Name>涓婃浣跨敤璁板綍ID</a:Name>
<a:Code>LAST_RECORD_ID</a:Code>
@@ -8518,7 +8530,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o382">
+<o:Column Id="o383">
<a:ObjectID>2669CCF5-FB7C-4D7E-9D76-8953F5A7D97A</a:ObjectID>
<a:Name>褰撳墠浣跨敤浜哄憳鐢佃瘽(0鏃舵湁鏁�)</a:Name>
<a:Code>NOW_USER_PHONE</a:Code>
@@ -8530,7 +8542,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o383">
+<o:Column Id="o384">
<a:ObjectID>225A1A97-D4D5-42D8-BAE6-F3D73ADD1E6F</a:ObjectID>
<a:Name>褰撳墠浣跨敤浜哄憳鍚嶇О(0鏃舵湁鏁�)</a:Name>
<a:Code>NOW_USER_NAME</a:Code>
@@ -8543,7 +8555,7 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o384">
+<o:Column Id="o385">
<a:ObjectID>85D6EA22-FE1E-4AA8-9CEC-4E0E2557F2D2</a:ObjectID>
<a:Name>鎿嶄綔浜虹紪鍙�</a:Name>
<a:Code>OPERATOR_ID</a:Code>
@@ -8555,7 +8567,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o385">
+<o:Column Id="o386">
<a:ObjectID>E5625391-B555-4BEE-97E4-4C6415B0E5A3</a:ObjectID>
<a:Name>鎿嶄綔浜哄鍚�</a:Name>
<a:Code>OPERATOR_NAME</a:Code>
@@ -8568,7 +8580,7 @@
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o386">
+<o:Column Id="o387">
<a:ObjectID>0C97B594-7D65-452C-B495-C79DF4BD7471</a:ObjectID>
<a:Name>鎿嶄綔鏃堕棿</a:Name>
<a:Code>DEAL_TIME</a:Code>
@@ -8582,7 +8594,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o387">
+<o:Key Id="o388">
<a:ObjectID>F2E883B7-2A0C-49F1-ABC9-945F3EFB3D87</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -8592,12 +8604,12 @@
<a:Modifier>cy</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o378"/>
+<o:Column Ref="o379"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o387"/>
+<o:Key Ref="o388"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o165">
@@ -8613,7 +8625,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o388">
+<o:Column Id="o389">
<a:ObjectID>522B6DE3-B187-4218-961C-56FB916CB66E</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -8626,7 +8638,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o389">
+<o:Column Id="o390">
<a:ObjectID>095CCBF2-BAE5-4BAE-80D6-779A46FCD5AE</a:ObjectID>
<a:Name>杩涘嚭搴撴祦姘存�昏〃ID</a:Name>
<a:Code>WAREHOUSE_FLOW_ID</a:Code>
@@ -8638,7 +8650,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o390">
+<o:Column Id="o391">
<a:ObjectID>BE1F0A1A-AC79-4C85-BCBE-0008FF34901D</a:ObjectID>
<a:Name>搴撳瓨鐗╁搧璇︽儏琛↖d</a:Name>
<a:Code>WH_GOODS_ID</a:Code>
@@ -8650,7 +8662,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o391">
+<o:Column Id="o392">
<a:ObjectID>7A6C0071-4E86-428B-91F2-8E9BE6AE26C0</a:ObjectID>
<a:Name>褰撳墠淇濈浠撳簱id</a:Name>
<a:Code>WAREHOUSE_ID</a:Code>
@@ -8662,7 +8674,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o392">
+<o:Column Id="o393">
<a:ObjectID>B34545B4-03E2-4548-ABC0-A1333214AE86</a:ObjectID>
<a:Name>鎿嶄綔鏃堕棿</a:Name>
<a:Code>DEAL_TIME</a:Code>
@@ -8676,7 +8688,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o393">
+<o:Key Id="o394">
<a:ObjectID>2BAC8AE6-1892-4043-AC90-A0D2BBC9F570</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -8686,12 +8698,12 @@
<a:Modifier>cy</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o388"/>
+<o:Column Ref="o389"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o393"/>
+<o:Key Ref="o394"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o174">
@@ -8707,7 +8719,7 @@
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o394">
+<o:Column Id="o395">
<a:ObjectID>9D048633-8FBA-46FE-A467-42743F0BDE29</a:ObjectID>
<a:Name>id</a:Name>
<a:Code>id</a:Code>
@@ -8720,7 +8732,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o395">
+<o:Column Id="o396">
<a:ObjectID>97BEFBD7-1FFF-4A97-BD0A-478BF1A94060</a:ObjectID>
<a:Name>杩涘嚭搴撴祦姘磇d</a:Name>
<a:Code>WH_GOODS_RECORD_ID</a:Code>
@@ -8732,7 +8744,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o396">
+<o:Column Id="o397">
<a:ObjectID>7732FC0F-15B8-46E1-8A7C-4326799845D5</a:ObjectID>
<a:Name>鐗╁搧id</a:Name>
<a:Code>WH_GOODS_ID</a:Code>
@@ -8744,7 +8756,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o397">
+<o:Column Id="o398">
<a:ObjectID>0776EE2A-1DD6-400C-ACF4-AD3FAAD1A90A</a:ObjectID>
<a:Name>鏈璋冩暣绫诲瀷</a:Name>
<a:Code>THIS_TYPE</a:Code>
@@ -8758,7 +8770,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o398">
+<o:Key Id="o399">
<a:ObjectID>1278B13E-9B79-4C2D-B5EF-39789F6BFA04</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -8768,12 +8780,12 @@
<a:Modifier>cy</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o394"/>
+<o:Column Ref="o395"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o398"/>
+<o:Key Ref="o399"/>
</c:PrimaryKey>
</o:Table>
<o:Table Id="o173">
@@ -8782,13 +8794,13 @@
<a:Code>L_WAREHOUSE_FLOW</a:Code>
<a:CreationDate>1698025914</a:CreationDate>
<a:Creator>cy</a:Creator>
-<a:ModificationDate>1698134531</a:ModificationDate>
+<a:ModificationDate>1698308611</a:ModificationDate>
<a:Modifier>cy</a:Modifier>
<a:Comment>杩涘嚭搴撴祦姘存�昏〃</a:Comment>
<a:GlobalObjectID/>
<a:TotalSavingCurrency/>
<c:Columns>
-<o:Column Id="o399">
+<o:Column Id="o400">
<a:ObjectID>E8E0CC8A-8F75-442F-B2CF-7E0D008D66DC</a:ObjectID>
<a:Name>ID</a:Name>
<a:Code>ID</a:Code>
@@ -8801,7 +8813,7 @@
<a:Column.Mandatory>1</a:Column.Mandatory>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o400">
+<o:Column Id="o401">
<a:ObjectID>18D09933-0F77-435B-AD27-0808D0323F8C</a:ObjectID>
<a:Name>浠撳簱缂栧彿</a:Name>
<a:Code>WAREHOUSE_ID</a:Code>
@@ -8813,7 +8825,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o401">
+<o:Column Id="o402">
<a:ObjectID>28C8FEA6-9877-469D-8061-FAA607DADCA7</a:ObjectID>
<a:Name>浠撳簱鍚嶇О</a:Name>
<a:Code>WAREHOUSE_NAME</a:Code>
@@ -8826,19 +8838,19 @@
<a:Length>100</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o402">
-<a:ObjectID>CE3E3702-3573-4BE0-9210-F126D2700E53</a:ObjectID>
-<a:Name>鏄惁鏈�鏂拌褰�</a:Name>
-<a:Code>LAST_RECORD</a:Code>
-<a:CreationDate>1698025950</a:CreationDate>
+<o:Column Id="o403">
+<a:ObjectID>FDC0DAB0-9B22-49BB-8880-25E1C5E052C5</a:ObjectID>
+<a:Name>鏈璋冩暣绫诲瀷</a:Name>
+<a:Code>THIS_TYPE</a:Code>
+<a:CreationDate>1698308591</a:CreationDate>
<a:Creator>cy</a:Creator>
-<a:ModificationDate>1698026132</a:ModificationDate>
+<a:ModificationDate>1698308611</a:ModificationDate>
<a:Modifier>cy</a:Modifier>
-<a:Comment>鏄惁鏈�鏂拌褰� 0 鍚�1鏄�</a:Comment>
+<a:Comment>1=璋冨锛�2=璋冨噺</a:Comment>
<a:DataType>smallint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o403">
+<o:Column Id="o404">
<a:ObjectID>894B0E69-4804-4E8B-9DB6-0D8775CDDF0D</a:ObjectID>
<a:Name>鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂</a:Name>
<a:Code>BUSINESS_TYPE</a:Code>
@@ -8850,7 +8862,7 @@
<a:DataType>smallint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o404">
+<o:Column Id="o405">
<a:ObjectID>7690EBD5-649D-4266-A668-C67815081E83</a:ObjectID>
<a:Name>涓氬姟鍗曟嵁缂栧彿</a:Name>
<a:Code>BUSINESS_FORM_ID</a:Code>
@@ -8862,7 +8874,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o405">
+<o:Column Id="o406">
<a:ObjectID>457B674A-788C-4F34-8330-DFC71F009FB7</a:ObjectID>
<a:Name>鎿嶄綔浜虹紪鍙�</a:Name>
<a:Code>OPERATOR_ID</a:Code>
@@ -8874,7 +8886,7 @@
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o406">
+<o:Column Id="o407">
<a:ObjectID>463D8ED6-6205-456F-A9D5-77D555AD4A22</a:ObjectID>
<a:Name>鎿嶄綔浜哄鍚�</a:Name>
<a:Code>OPERATOR_NAME</a:Code>
@@ -8887,7 +8899,7 @@
<a:Length>32</a:Length>
<a:GlobalObjectID/>
</o:Column>
-<o:Column Id="o407">
+<o:Column Id="o408">
<a:ObjectID>D8505766-962D-407E-85C4-D2CDF3637553</a:ObjectID>
<a:Name>鎿嶄綔鏃堕棿</a:Name>
<a:Code>DEAL_TIME</a:Code>
@@ -8901,7 +8913,7 @@
</o:Column>
</c:Columns>
<c:Keys>
-<o:Key Id="o408">
+<o:Key Id="o409">
<a:ObjectID>3E877553-853E-49FC-B433-CFEF2FD578D5</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@@ -8911,12 +8923,12 @@
<a:Modifier>cy</a:Modifier>
<a:GlobalObjectID/>
<c:Key.Columns>
-<o:Column Ref="o399"/>
+<o:Column Ref="o400"/>
</c:Key.Columns>
</o:Key>
</c:Keys>
<c:PrimaryKey>
-<o:Key Ref="o408"/>
+<o:Key Ref="o409"/>
</c:PrimaryKey>
</o:Table>
</c:Tables>
@@ -8943,7 +8955,7 @@
<o:Key Ref="o226"/>
</c:ParentKey>
<c:Joins>
-<o:ReferenceJoin Id="o409">
+<o:ReferenceJoin Id="o410">
<a:ObjectID>C0D70E1D-85A8-421C-9783-2B71A31600E8</a:ObjectID>
<a:CreationDate>1696479126</a:CreationDate>
<a:Creator>Administrator</a:Creator>
@@ -8981,7 +8993,7 @@
<o:Key Ref="o234"/>
</c:ParentKey>
<c:Joins>
-<o:ReferenceJoin Id="o410">
+<o:ReferenceJoin Id="o411">
<a:ObjectID>056260EE-7796-4235-8D53-EACA2B7909ED</a:ObjectID>
<a:CreationDate>1696836074</a:CreationDate>
<a:Creator>asus</a:Creator>
@@ -8992,7 +9004,7 @@
<o:Column Ref="o227"/>
</c:Object1>
<c:Object2>
-<o:Column Ref="o301"/>
+<o:Column Ref="o302"/>
</c:Object2>
</o:ReferenceJoin>
</c:Joins>
@@ -9016,10 +9028,10 @@
<o:Table Ref="o206"/>
</c:ChildTable>
<c:ParentKey>
-<o:Key Ref="o322"/>
+<o:Key Ref="o323"/>
</c:ParentKey>
<c:Joins>
-<o:ReferenceJoin Id="o411">
+<o:ReferenceJoin Id="o412">
<a:ObjectID>1A2CA4E4-9C0D-4B76-B985-CDCC6632D7A5</a:ObjectID>
<a:CreationDate>1696999475</a:CreationDate>
<a:Creator>asus</a:Creator>
@@ -9027,10 +9039,10 @@
<a:Modifier>asus</a:Modifier>
<a:GlobalObjectID/>
<c:Object1>
-<o:Column Ref="o308"/>
+<o:Column Ref="o309"/>
</c:Object1>
<c:Object2>
-<o:Column Ref="o341"/>
+<o:Column Ref="o342"/>
</c:Object2>
</o:ReferenceJoin>
</c:Joins>
@@ -9057,7 +9069,7 @@
<o:Key Ref="o281"/>
</c:ParentKey>
<c:Joins>
-<o:ReferenceJoin Id="o412">
+<o:ReferenceJoin Id="o413">
<a:ObjectID>51540050-E379-4527-A236-2D407A3D1A55</a:ObjectID>
<a:CreationDate>1697267671</a:CreationDate>
<a:Creator>39886</a:Creator>
@@ -9068,7 +9080,7 @@
<o:Column Ref="o263"/>
</c:Object1>
<c:Object2>
-<o:Column Ref="o351"/>
+<o:Column Ref="o352"/>
</c:Object2>
</o:ReferenceJoin>
</c:Joins>
@@ -9092,10 +9104,10 @@
<o:Table Ref="o190"/>
</c:ChildTable>
<c:ParentKey>
-<o:Key Ref="o307"/>
+<o:Key Ref="o308"/>
</c:ParentKey>
<c:Joins>
-<o:ReferenceJoin Id="o413">
+<o:ReferenceJoin Id="o414">
<a:ObjectID>C6025392-2066-4326-8B61-77E920BDFA93</a:ObjectID>
<a:CreationDate>1698037943</a:CreationDate>
<a:Creator>cy</a:Creator>
@@ -9103,7 +9115,7 @@
<a:Modifier>cy</a:Modifier>
<a:GlobalObjectID/>
<c:Object1>
-<o:Column Ref="o298"/>
+<o:Column Ref="o299"/>
</c:Object1>
<c:Object2>
<o:Column Ref="o282"/>
@@ -9383,7 +9395,7 @@
<o:PhysicalDiagram Ref="o4"/>
</c:DefaultDiagram>
<c:MultidimensionalDiagrams>
-<o:MultidimensionalDiagram Id="o414">
+<o:MultidimensionalDiagram Id="o415">
<a:ObjectID>49477777-FF6D-42D5-B8C7-645FB031B3CA</a:ObjectID>
<a:Name>MultidimensionalDiagram_1</a:Name>
<a:Code>MultidimensionalDiagram_1</a:Code>
@@ -9751,7 +9763,7 @@
</o:MultidimensionalDiagram>
</c:MultidimensionalDiagrams>
<c:DefaultGroups>
-<o:Group Id="o415">
+<o:Group Id="o416">
<a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
<a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code>
@@ -9763,7 +9775,7 @@
</o:Group>
</c:DefaultGroups>
<c:TargetModels>
-<o:TargetModel Id="o416">
+<o:TargetModel Id="o417">
<a:ObjectID>86C176DC-EF89-49F0-83BA-DBF35E50C91E</a:ObjectID>
<a:Name>MySQL 5.0</a:Name>
<a:Code>MYSQL50</a:Code>
diff --git a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
index ef2b354..f70e2bb 100644
--- a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
+++ b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
@@ -6,12 +6,8 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;
-import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import org.springframework.util.IdGenerator;
-
-import java.util.List;
/**
* 缂栫爜缁熶竴鐢熸垚鏈嶅姟
@@ -29,7 +25,7 @@
System.out.println(prefix);
}
- private String createCodeByPrefix(String prefix,int length){
+ public String createCodeByPrefix(String prefix,int length){
String CODE_PREFIX = prefix;
String sql = "SELECT * from BASE_CODE_INDEXING where CODE_PREFIX=:CODE_PREFIX";
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java
new file mode 100644
index 0000000..01caafb
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java
@@ -0,0 +1,853 @@
+package com.consum.base.core;
+
+import com.consum.base.core.param.BaseWarehouseParam;
+import com.consum.base.core.param.DepBackWarehouseParam;
+import com.consum.base.core.tools.SqlParameter;
+import com.consum.base.core.tools.SuperMap;
+import com.consum.base.core.util.DateUtil;
+import com.consum.model.po.*;
+import com.walker.infrastructure.utils.NumberGenerator;
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 杩涘嚭搴� 涓氬姟澶� 绫�
+ */
+@Service
+public class WarehouseBusinessServiceBAK extends BaseServiceImpl {
+
+
+ @Autowired
+ private WarehouseCoreService coreService;
+
+ /**
+ * 鎵ц閲囪喘鍏ュ簱
+ * 绗竴姝ワ細閫氳繃閲囪喘鍗曘�怶H_FORM_PROCURE銆戞煡璇㈤噰璐崟鍨嬪彿銆怶H_FORM_PROCURE_MODEL銆戞暟鎹�
+ * 绗簩姝ワ細缁勭粐CheckWarehouseParam锛岃皟鐢╓arehouseCoreService.unifyCheck()鎵ц鍏ュ簱
+ * 绗笁姝ワ細鏇存柊閲囪喘鍗曞瀷鍙枫�怶H_FORM_PROCURE_MODEL銆戝簱瀛樼墿鍝佺紪鍙峰瓧娈靛強涓昏〃WH_FORM_PROCURE鐘舵�佷俊鎭�
+ * 绗洓姝ワ細鏇存柊 杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
+ * @param procure
+ */
+ public void doProcure(WhFormProcure procure){
+
+ String sql = "SELECT\n" +
+ " * \n" +
+ "FROM\n" +
+ " WH_FORM_PROCURE_MODEL A \n" +
+ "WHERE\n" +
+ " A.WH_FORM_PROCURE_ID = :PROCURE_ID";
+
+ List<WhFormProcureModel> modelList = this.select(sql,new SqlParameter().put("PROCURE_ID",procure.getId()),new WhFormProcureModel());
+
+ for (WhFormProcureModel model : modelList){
+ BaseWarehouseParam param = new BaseWarehouseParam();
+ param.setIsCheckIn(true);
+ param.setWarehouseId(procure.getId());
+ param.setCount(model.getCounts());
+ param.setFirstInputCode(model.getId().toString());
+ param.setFirst_input_type(1);
+ param.setModelId(model.getBaseGoodsModelsId());
+ CheckWarehouseResult result = coreService.unifyCheck(param).get(0);
+
+
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setId(result.getWhGoods().getFirstInputHisId());
+ details.setBusinessFormId(procure.getId());
+ details.setBusinessFormCode(procure.getBusinessFormCode());
+ details.setBusinessFormName(procure.getWarehouseName() + "閲囪喘鍏ュ簱鍗�:" + details.getBusinessFormCode());
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(1);
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(param.getWarehouseId());
+ details.setWarehouseName(procure.getWarehouseName());
+ details.setClassification(1);
+ details.setOperatorId(procure.getOperatorId2());
+ details.setOperatorName(procure.getOperatorName2());
+ details.setDealTime(procure.getIncomeTime());
+ details.setWhGoodsId(result.getWhGoods().getId());
+
+ this.insert(details);
+
+
+ model.setInWhGoodsDetailsId(details.getId());
+ update(model);
+
+ procure.setStates(2);
+ update(procure);
+ }
+ }
+ public void doOutPut(WhFormOutput output){
+ String sql = "SELECT\n" +
+ " * \n" +
+ "FROM\n" +
+ " WH_FORM_OUTPUT_GOODS A \n" +
+ "WHERE\n" +
+ " A.WH_FORM_OUTPUT_ID = :OUTPUT_ID";
+
+ List<WhFormOutputGoods> goodsList = this.select(sql,new SqlParameter()
+ .put("OUTPUT_ID",output.getId()),new WhFormOutputGoods());
+
+ for (WhFormOutputGoods goods : goodsList){
+ BaseWarehouseParam param = new BaseWarehouseParam();
+ param.setIsCheckIn(false);
+ param.setWarehouseId(output.getWarehouseId());
+ param.setModelId(goods.getBaseGoodsModelsId());
+ param.setCount(goods.getCounts());
+
+ List<CheckWarehouseResult> results = coreService.unifyCheck(param);
+ for (CheckWarehouseResult result : results){
+ WhFormOutputModel model = new WhFormOutputModel();
+ model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setCounts(result.getInitial_count() - result.getEnd_count());
+ model.setOutWhGoodsDetailsId(result.getWhGoods().getId());
+ model.setWhGoodsId(result.getWhGoods().getId());
+ model.setWhFormOutputId(output.getId());
+ model.setWhFormOutputGoodsId(goods.getId());
+ insert(model);
+
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setBusinessFormId(output.getId());
+ details.setBusinessFormCode(output.getBusinessFormCode());
+ details.setBusinessFormName("鍑哄簱鍗曪細" + output.getBusinessFormCode());
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(2);
+ details.setThisCount(result.getInitial_count() - result.getEnd_count());
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(result.getWhGoods().getWarehouseId());
+ details.setWarehouseName(result.getWhGoods().getWarehouseName());
+ details.setClassification(3);
+ details.setOperatorId(output.getOperatorId());
+ details.setOperatorName(output.getOperatorName());
+ details.setDealTime(output.getDealTime());
+ details.setWhGoodsId(result.getWhGoods().getId());
+ this.insert(details);
+ }
+ }
+ }
+
+
+ /**
+ * 鎵ц璋冩嫧鍑哄簱鎿嶄綔
+ * 1. 閫氳繃璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戙�佽皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_GOODS銆戠粍缁嘋heckWarehouseParam
+ * 2. 璋冪敤璋冪敤WarehouseCoreService.unifyCheck()鎵ц鍑哄簱
+ * 3. 鏇存柊杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
+ * 4. 鏇存柊璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戜负寰呮帴鏀讹紝鏇存柊璋冩嫧鍗曠墿鍝併�怶H_FORM_TRANSFER_MODEL銆戝嚭搴撴祦姘碔D
+ * @param transfer
+ */
+ public void doTransferOutPut(WhFormTransfer transfer){
+ String sql = "SELECT\n" +
+ " * \n" +
+ "FROM\n" +
+ " WH_FORM_TRANSFER_GOODS A \n" +
+ "WHERE\n" +
+ " A.WH_FORM_TRANSFER_ID = :TRANSFER_ID";
+
+ List<WhFormTransferGoods> goodsList = this.select(sql,new SqlParameter()
+ .put("TRANSFER_ID",transfer.getId()),new WhFormTransferGoods());
+
+ for (WhFormTransferGoods goods : goodsList){
+ BaseWarehouseParam param = new BaseWarehouseParam();
+ param.setIsCheckIn(false);
+ param.setWarehouseId(transfer.getOutWarehouseId());
+ param.setCount(goods.getCounts());
+ List<CheckWarehouseResult> results = coreService.unifyCheck(param);
+ for (CheckWarehouseResult result : results){
+ WhFormTransferModel model = new WhFormTransferModel();
+ model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setWhFormTransferId(transfer.getId());
+ model.setWorehouseCount(result.getInitial_count());
+ model.setCounts(result.getInitial_count() - result.getEnd_count());
+ model.setOutWhGoodsDetailsId(result.getWhGoods().getId());
+ model.setWhFormTransferGoodsId(goods.getId());
+ insert(model);
+
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setBusinessFormId(transfer.getId());
+ details.setBusinessFormCode(transfer.getBusinessFormCode());
+ details.setBusinessFormName("璋冩嫧鍑哄簱鍗曪細" + transfer.getBusinessFormCode());
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(2);
+ details.setThisCount(result.getInitial_count() - result.getEnd_count());
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(result.getWhGoods().getWarehouseId());
+ details.setWarehouseName(result.getWhGoods().getWarehouseName());
+ details.setClassification(5);
+ details.setOperatorId(transfer.getOperatorId());
+ details.setOperatorName(transfer.getOperatorName());
+ details.setDealTime(transfer.getOutputTime());
+ details.setWhGoodsId(result.getWhGoods().getId());
+ this.insert(details);
+ }
+ }
+ }
+
+ /**
+ * 鎵ц璋冩嫧鍏ュ簱鎿嶄綔
+ * 1. 閫氳繃璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戙�佽皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_GOODS銆戠粍缁嘋heckWarehouseParam
+ * 2. 璋冪敤璋冪敤WarehouseCoreService.unifyCheck()鎵ц鍑哄簱
+ * 3. 鏇存柊杩涘嚭搴撴祦姘达紙浠撳簱锛夈�怶H_GOODS_DETAILS銆�
+ * 4. 鏇存柊璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戜负宸插叆搴擄紝锛屾洿鏂拌皟鎷ㄥ崟鐗╁搧銆怶H_FORM_TRANSFER_MODEL銆戝叆搴撴祦姘碔D
+ * @param transfer
+ */
+ public void doTransferInPut(WhFormTransfer transfer){
+
+ String sql = "SELECT\n" +
+ " * \n" +
+ "FROM\n" +
+ " WH_FORM_TRANSFER_MODEL A \n" +
+ "WHERE\n" +
+ " A.WH_FORM_TRANSFER_ID = :TRANSFER_ID";
+
+ List<WhFormTransferModel> modelsList = this.select(sql,new SqlParameter()
+ .put("TRANSFER_ID",transfer.getId()),new WhFormTransferModel());
+
+ for (WhFormTransferModel model : modelsList) {
+ BaseWarehouseParam param = new BaseWarehouseParam();
+ param.setIsCheckIn(true);
+ param.setWarehouseId(transfer.getInWarehouseId());
+ param.setCount(model.getCounts());
+ param.setWh_goods_id(model.getWhGoodsId());
+ CheckWarehouseResult result = coreService.unifyCheck(param).get(0);
+
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setBusinessFormId(transfer.getId());
+ details.setBusinessFormCode(transfer.getBusinessFormCode());
+ details.setBusinessFormName("璋冩嫧鍏ュ簱鍗曪細" + transfer.getBusinessFormCode());
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(1);
+ details.setThisCount(result.getEnd_count()-result.getInitial_count());
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(result.getWhGoods().getWarehouseId());
+ details.setWarehouseName(result.getWhGoods().getWarehouseName());
+ details.setClassification(4);
+ details.setOperatorId(transfer.getOperatorId2());
+ details.setOperatorName(transfer.getOperatorName2());
+ details.setDealTime(transfer.getIninputTime());
+ details.setWhGoodsId(result.getWhGoods().getId());
+ this.insert(details);
+
+ model.setInWhGoodsDetailsId(details.getId());
+ update(model);
+ }
+ }
+
+ /**
+ * 鎶ュ簾鍗�
+ * @param scrapped
+ */
+ public void doScrapped(WhFormScrapped scrapped){
+ String sql = "SELECT\n" +
+ " * \n" +
+ "FROM\n" +
+ " WH_FORM_SCRAPPED_GOODS A \n" +
+ "WHERE\n" +
+ " A.DEP_FORM_SCRAPPED_ID = :SCRAPPED_ID";
+
+ List<WhFormScrappedGoods> goodsList = this.select(sql,new SqlParameter()
+ .put("SCRAPPED_ID",scrapped.getId()),new WhFormScrappedGoods());
+
+ for (WhFormScrappedGoods goods : goodsList){
+ BaseWarehouseParam param = new BaseWarehouseParam();
+ param.setIsCheckIn(false);
+ param.setWarehouseId(scrapped.getWarehouseId());
+ param.setCount(goods.getCounts());
+ List<CheckWarehouseResult> results = coreService.unifyCheck(param);
+ for (CheckWarehouseResult result : results){
+
+
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setBusinessFormId(scrapped.getId());
+ details.setBusinessFormCode(scrapped.getBusinessFormCode());
+ details.setBusinessFormName("鎶ュ簾鍗曪細" + scrapped.getBusinessFormCode());
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(2);
+ details.setThisCount(result.getInitial_count() - result.getEnd_count());
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(result.getWhGoods().getWarehouseId());
+ details.setWarehouseName(result.getWhGoods().getWarehouseName());
+ details.setClassification(10);
+ details.setOperatorId(scrapped.getOperatorId());
+ details.setOperatorName(scrapped.getOperatorName());
+ details.setDealTime(scrapped.getDealTime());
+ details.setWhGoodsId(result.getWhGoods().getId());
+ this.insert(details);
+
+
+ WhFormScrappedModel model = new WhFormScrappedModel();
+ model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setCounts(result.getWhGoods().getWhCount());
+ model.setScrappedCode(goods.getScrappedCode());
+ model.setScrappedName(goods.getScrappedName());
+ model.setDepGoodsDetailsId(details.getId());
+ model.setDepFormScrappedId(scrapped.getId());
+ model.setWhGoodsId(result.getWhGoods().getId());
+ model.setWhFormScrappedGoodsId(goods.getId());
+ insert(model);
+ }
+ }
+ }
+
+ /**
+ * 鍒涘缓鐩樼偣浠诲姟锛屽垱寤虹洏鐐逛换鍔℃椂锛屾牴鎹綋鏃舵椂闂翠細灏嗗簱瀛樻暟鎹喕缁撲竴浠芥斁鍏ュ緟鐩樼偣鍗曘��
+ * 1.浠庡簱瀛樼墿鍝併�怶H_GOODS銆戜腑鎸夌収浠撳簱灏嗘暟鎹斁鍏ョ洏鐐瑰崟鐗╁搧銆怶H_FORM_INVENTORY_GOODS銆戯紝涓昏鏄�
+ * 鏈熷垵鏁伴噺INIT_COUNTS锛屽拰 搴撳瓨鐗╁搧缂栧彿WH_GOODS_ID瀛楁
+ * @param inventory
+ */
+ public void createInventoryForm(WhFormInventory inventory){
+ String sql =
+ "SELECT\n" +
+ " b.BASE_GOODS_TEMPLATE_ID,\n" +
+ " b.GOODS_TEMPLATE_NAME,\n" +
+ " SUM( b.WH_COUNT ) AS WH_COUNT,\n" +
+ " b.BASE_GOODS_MODELS_ID,\n" +
+ " b.BASE_GOODS_MODELS_NAME,\n" +
+ " b.UNIT \n" +
+ "FROM\n" +
+ " (\n" +
+ " SELECT\n" +
+ " ID \n" +
+ " FROM\n" +
+ " BASE_GOODS_MODELS m \n" +
+ " WHERE\n" +
+ " STATES != 3 \n" +
+ " AND EXISTS ( SELECT 1 FROM BASE_GOODS_TEMPLATE t WHERE t.ID = m.GOODS_TEMPLATES_ID AND t.STATES != 3 ) \n" +
+ " ) a\n" +
+ " LEFT JOIN wh_goods b ON a.ID = b.BASE_GOODS_MODELS_ID \n" +
+ "WHERE\n" +
+ " b.STATES = 1 \n" +
+ " AND b.WAREHOUSE_ID =:WAREHOUSE_ID \n" +
+ "GROUP BY\n" +
+ " b.BASE_GOODS_TEMPLATE_ID,\n" +
+ " b.GOODS_TEMPLATE_NAME,\n" +
+ " b.BASE_GOODS_MODELS_ID,\n" +
+ " b.BASE_GOODS_MODELS_NAME";
+
+ List<WhGoods> goodsList = select(sql,new SqlParameter().add("WAREHOUSE_ID",inventory.getWarehouseId()));
+ List<WhFormInventoryGoods> list = new ArrayList<>();
+ for (WhGoods goods : goodsList) {
+ WhFormInventoryGoods inventoryGoods = new WhFormInventoryGoods();
+ inventoryGoods.setId(NumberGenerator.getLongSequenceNumber());
+ inventoryGoods.setWhFormInventoryId(inventory.getId());
+ inventoryGoods.setBaseGoodsTemplateId(goods.getBaseGoodsTemplateId());
+ inventoryGoods.setGoodsTemplateName(goods.getGoodsTemplateName());
+ inventoryGoods.setUnit(goods.getUnit());
+ inventoryGoods.setBaseGoodsModelsId(goods.getBaseGoodsModelsId());
+ inventoryGoods.setBaseGoodsModelsName(goods.getBaseGoodsModelsName());
+ inventoryGoods.setInitCounts(goods.getWhCount());
+ inventoryGoods.setInitCounts(null);
+ inventoryGoods.setErrorCounts(null);
+ inventoryGoods.setInventoryResult(1);
+ list.add(inventoryGoods);
+ }
+ insertBatch(list);
+
+ }
+
+ /**
+ * 鐩樼偣鍑哄簱
+ * @param inventory
+ */
+ public void doInventoryOutput(WhFormInventory inventory){
+ String sql = "SELECT\n" +
+ " * \n" +
+ "FROM\n" +
+ " WH_FORM_INVENTORY_GOODS A \n" +
+ "WHERE\n" +
+ " A.WH_FORM_INVENTORY_ID = :INVENTORY_ID \n" +
+ " AND A.INVENTORY_RESULT =3 ";
+
+ List<WhFormInventoryGoods> goodsList = this.select(sql,new SqlParameter()
+ .put("INVENTORY_ID",inventory.getId()),new WhFormInventoryGoods());
+
+ for (WhFormInventoryGoods goods : goodsList){
+ BaseWarehouseParam param = new BaseWarehouseParam();
+ param.setIsCheckIn(false);
+ param.setWarehouseId(inventory.getWarehouseId());
+ param.setCount(goods.getErrorCounts());
+ param.setModelId(goods.getBaseGoodsModelsId());
+ param.setOutput_type(3);
+ List<CheckWarehouseResult> results = coreService.unifyCheck(param);
+ for (CheckWarehouseResult result : results){
+
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setBusinessFormId(inventory.getId());
+ details.setBusinessFormCode(inventory.getBusinessFormCode());
+ details.setBusinessFormName("鐩樼偣鍑哄崟锛�" + inventory.getBusinessFormCode());
+
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(2);
+ details.setThisCount(result.getInitial_count() - result.getEnd_count());
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(result.getWhGoods().getWarehouseId());
+ details.setWarehouseName(result.getWhGoods().getWarehouseName());
+ details.setClassification(9);
+ details.setOperatorId(inventory.getOperatorId());
+ details.setOperatorName(inventory.getOperatorName());
+ details.setDealTime(inventory.getStopTime());
+ details.setWhGoodsId(result.getWhGoods().getId());
+ this.insert(details);
+
+
+ WhFormInventoryModel model = new WhFormInventoryModel();
+ model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setCounts(result.getWhGoods().getWhCount());
+ model.setWhFormInventoryId(inventory.getId());
+ model.setInventoryResult(3);
+ model.setWhGoodsDetailsId(details.getId());
+ model.setWhFormInventoryGoodsId(goods.getId());
+ model.setWhGoodsId(result.getWhGoods().getId());
+ insert(model);
+ }
+ }
+ }
+
+ /**
+ * 鐩樼偣鍏ュ簱
+ * @param inventory
+ */
+ public void doInventoryInput(WhFormInventory inventory){
+ String sql = "SELECT\n" +
+ " * \n" +
+ "FROM\n" +
+ " WH_FORM_INVENTORY_GOODS A \n" +
+ "WHERE\n" +
+ " A.WH_FORM_INVENTORY_ID = :INVENTORY_ID \n" +
+ " AND A.INVENTORY_RESULT =2 ";
+
+ List<WhFormInventoryGoods> goodsList = this.select(sql,new SqlParameter()
+ .put("INVENTORY_ID",inventory.getId()),new WhFormInventoryGoods());
+
+ for (WhFormInventoryGoods goods : goodsList){
+ BaseWarehouseParam param = new BaseWarehouseParam();
+ param.setIsCheckIn(true);
+ param.setWarehouseId(inventory.getWarehouseId());
+ param.setCount(goods.getErrorCounts());
+ param.setModelId(goods.getBaseGoodsModelsId());
+ param.setFirst_input_type(3);
+ CheckWarehouseResult result = coreService.unifyCheck(param).get(0);
+
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setBusinessFormId(inventory.getId());
+ details.setBusinessFormCode(inventory.getBusinessFormCode());
+ details.setBusinessFormName("鐩樼偣鍏ュ簱鍗曪細" + inventory.getBusinessFormCode());
+
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(1);
+ details.setThisCount(result.getEnd_count()-result.getInitial_count());
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(result.getWhGoods().getWarehouseId());
+ details.setWarehouseName(result.getWhGoods().getWarehouseName());
+ details.setClassification(8);
+ details.setOperatorId(inventory.getOperatorId());
+ details.setOperatorName(inventory.getOperatorName());
+ details.setDealTime(inventory.getStopTime());
+ details.setWhGoodsId(result.getWhGoods().getId());
+ this.insert(details);
+
+
+ WhFormInventoryModel model = new WhFormInventoryModel();
+ model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setCounts(result.getWhGoods().getWhCount());
+ model.setWhFormInventoryId(inventory.getId());
+ model.setInventoryResult(3);
+ model.setWhGoodsDetailsId(details.getId());
+ model.setWhFormInventoryGoodsId(goods.getId());
+ model.setWhGoodsId(result.getWhGoods().getId());
+ insert(model);
+ }
+ }
+
+ /**
+ * 缁熶竴澶勭悊搴撳瓨棰勮锛堝畾鏃朵换鍔¤皟鐢ㄦ湇鍔★級
+ * 璁″垝锛氭瘡澶╀腑鍗�13锛�00銆佹櫄涓�1:00鎵ц涓ゆ
+ */
+ public void insertWarning(){
+
+ String sql = "SELECT\n" +
+ " SUM(b.WH_COUNT) AS WH_COUNT,\n" +
+ " b.BASE_GOODS_TEMPLATE_ID,\n" +
+ " b.GOODS_TEMPLATE_NAME,\n" +
+ " b.WAREHOUSE_ID,\n" +
+ " a.UPPER_LIMIT,\n" +
+ " a.LOWER_LIMIT \n" +
+ "FROM\n" +
+ " WH_WARNING_CONFIG a\n" +
+ " LEFT JOIN wh_goods b ON a.BASE_GOODS_TEMPLATE_ID = b.BASE_GOODS_TEMPLATE_ID \n" +
+ "WHERE\n" +
+ " a.BASE_WAREHOUSE_ID = b.WAREHOUSE_ID \n" +
+ " AND b.STATES = 1 \n" +
+ " AND a.GOODS_TYPE=1\n" +
+ " AND ( a.UPPER_LIMIT <= WH_COUNT OR a.LOWER_LIMIT >= WH_COUNT ) \n" +
+ "GROUP BY\n" +
+ " b.BASE_GOODS_TEMPLATE_ID,\n" +
+ " b.GOODS_TEMPLATE_NAME,\n" +
+ " b.WAREHOUSE_ID,\n" +
+ " a.UPPER_LIMIT,\n" +
+ " a.LOWER_LIMIT";
+
+ List<Map> goodslist = select(sql,new SqlParameter());
+
+ sql = "SELECT\n" +
+ " SUM(b.WH_COUNT) AS WH_COUNT,\n" +
+ " b.BASE_GOODS_TEMPLATE_ID,\n" +
+ " b.GOODS_TEMPLATE_NAME,\n" +
+ " b.BASE_GOODS_MODELS_ID,\n" +
+ " b.BASE_GOODS_MODELS_NAME,\n" +
+ " b.WAREHOUSE_ID,\n" +
+ " a.UPPER_LIMIT,\n" +
+ " a.LOWER_LIMIT \n" +
+ "FROM\n" +
+ " WH_WARNING_CONFIG a\n" +
+ " LEFT JOIN wh_goods b ON a.BASE_GOODS_MODELS_ID = b.BASE_GOODS_MODELS_ID \n" +
+ "WHERE\n" +
+ " a.BASE_WAREHOUSE_ID = b.WAREHOUSE_ID \n" +
+ " AND b.STATES = 1 \n" +
+ " AND a.GOODS_TYPE=2\n" +
+ " AND ( a.UPPER_LIMIT <= WH_COUNT OR a.LOWER_LIMIT >= WH_COUNT ) \n" +
+ "GROUP BY\n" +
+ " b.BASE_GOODS_TEMPLATE_ID,\n" +
+ " b.GOODS_TEMPLATE_NAME,\n" +
+ " b.BASE_GOODS_MODELS_ID,\n" +
+ " b.BASE_GOODS_MODELS_NAME,\n" +
+ " b.WAREHOUSE_ID,\n" +
+ " a.UPPER_LIMIT,\n" +
+ " a.LOWER_LIMIT";
+
+ List<Map> modeslist = select(sql,new SqlParameter());
+
+ List<Map> list = new ArrayList<>();
+ list.addAll(goodslist);
+ list.addAll(modeslist);
+
+ List<WhWarning> warningList = new ArrayList<>();
+ for (Map map : list) {
+ SuperMap superMap = new SuperMap(map);
+ BaseWarehouse warehouse = get(new BaseWarehouse(),"ID=?",new Object[]{superMap.get("WAREHOUSE_ID")});
+
+ WhWarning warning = new WhWarning();
+ warning.setId(NumberGenerator.getLongSequenceNumber());
+ warning.setBaseWarehouseId(warehouse.getId());
+ warning.setBaseWarehouseName(warehouse.getWarehouseName());
+ warning.setBaseGoodsTemplateId(superMap.getLong("BASE_GOODS_TEMPLATE_ID"));
+ warning.setBaseGoodsTemplateName(superMap.getString("GOODS_TEMPLATE_NAME"));
+ if (superMap.getString("BASE_GOODS_MODELS_ID") == null){
+ warning.setGoodsType(1);
+ } else {
+ warning.setBaseGoodsModelsId(superMap.getLong("BASE_GOODS_MODELS_ID"));
+ warning.setBaseGoodsModelsName(superMap.getString("BASE_GOODS_MODELS_NAME"));
+ warning.setGoodsType(2);
+ }
+
+ int whCount = superMap.getInteger("WH_COUNT");
+ int upCount = superMap.getInteger("UPPER_LIMIT");
+ int lowCount = superMap.getInteger("LOWER_LIMIT");
+
+ if (whCount >= upCount){
+ warning.setWarningType(1);
+ }
+ if (whCount<=lowCount){
+ warning.setWarningType(2);
+ }
+
+ warning.setUpperLimit(upCount);
+ warning.setLowerLimit(lowCount);
+ warning.setWarehouseCount(whCount);
+ warning.setStates(1);
+ warning.setWarningTime(DateUtil.getCurrentDateFor14());
+ warning.setAgencyId(warehouse.getAgencyId());
+ warning.setAgencyName(warehouse.getAgencyName());
+
+ warningList.add(warning);
+ }
+
+ insertBatch(warningList);
+ }
+
+ public void doDepBack(String depFormBackId){
+
+ DepFormBack back = get(new DepFormBack(),"ID=?",new Object[]{depFormBackId});
+
+ String sql = "SELECT\n" +
+ " B.*,\n" +
+ " A.BACK_COUNTS, \n" +
+ " A.ID AS DEP_FORM_BACK_GOODS_ID \n" +
+ "FROM\n" +
+ " DEP_FORM_BACK_GOODS A\n" +
+ " LEFT JOIN DEP_FORM_LENDING_GOODS B ON A.DEP_FORM_LENDING_GOODS_ID = B.ID \n" +
+ "WHERE\n" +
+ " A.DEP_FORM_BACK_ID = :DEP_FORM_BACK_ID \n" +
+ " AND A.WAREHOUSE_ID = B.WAREHOUSE_ID \n" +
+ " AND A.WAREHOUSE_ID = :WAREHOUSE_ID";
+
+ List<Map> list = select(sql,new SqlParameter("DEP_FORM_BACK_ID",back.getId()).add("WAREHOUSE_ID",back.getWarehouseId()));
+
+ for (Map myMap : list) {
+ SuperMap map = new SuperMap(myMap);
+
+ CheckUsingParam param = new CheckUsingParam();
+ param.setIsCheckIn(false);
+ param.setLending_id(map.getLong("DEP_FORM_LENDING_ID"));
+ param.setModel_id(map.getLong("BASE_GOODS_MODELS_ID"));
+ param.setUser_name(map.getString("GOODS_USER_NAME"));
+
+ List<CheckUsingResult> resultList = coreService.unifyUsingCheck(param);
+ for (CheckUsingResult result : resultList) {
+ BaseWarehouseParam param1 = new DepBackWarehouseParam();
+ param1.setIsCheckIn(true);
+ param1.setWarehouseId(result.getLendingModel().getWarehouseId());
+ param1.setModelId(result.getLendingModel().getBaseGoodsModelsId());
+ param1.setCount(result.getEnd_count() - result.getInitial_count());
+ param1.setFirst_input_type(4);
+
+ //鍏ュ簱骞跺瓨鍏ユ祦姘�
+ CheckWarehouseResult result1 = coreService.unifyCheck(param1).get(0);
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setId(result1.getWhGoods().getFirstInputHisId());
+ details.setBusinessFormId(back.getId());
+ details.setBusinessFormCode(back.getBusinessFormCode());
+ details.setBusinessFormName(back.getWarehouseName() + "杩斿簱鍏ュ簱鍗�:" + details.getBusinessFormCode());
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(1);
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(back.getWarehouseId());
+ details.setWarehouseName(back.getWarehouseName());
+ details.setClassification(1);
+ details.setOperatorId(back.getOperatorId());
+ details.setOperatorName(back.getOperatorName());
+ details.setDealTime(back.getDealTime());
+ details.setWhGoodsId(result1.getWhGoods().getId());
+
+ this.insert(details);
+
+
+ //瀛樺叆鍦ㄧ敤娴佹按
+ UsingGoodsHis his = new UsingGoodsHis();
+ his.setId(NumberGenerator.getLongSequenceNumber());
+ his.setBusinessFormId(back.getId());
+ his.setBusinessFormCode(back.getBusinessFormCode());
+ his.setBusinessFormName("杩斿簱鍗曪細" + back.getBusinessFormCode());
+ his.setClassification(3);
+ his.setOperatorId(back.getOperatorId());
+ his.setOperatorName(back.getOperatorName());
+ his.setDealTime(back.getDealTime());
+ his.setDepFormLendingModelId(result.getLendingModel().getId());
+ his.setDepFormLendingGoodsId(result.getLendingModel().getDepFormLendingGoodsId());
+ his.setDepFormLendingId(result.getLendingModel().getDepFormLendingId());
+ his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
+ his.setInitialCount(result.getInitial_count());
+ his.setEndCount(result.getEnd_count());
+ his.setWarehouseId(back.getWarehouseId());
+ his.setWarehouseName(back.getWarehouseName());
+ his.setDepartmentId(back.getDepartmentId());
+ his.setDepartmentName(back.getDepartmentName());
+ insert(his);
+
+ DepFormBackModel model = new DepFormBackModel();
+ model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setDepFormBackGoodsId(map.getLong("DEP_FORM_BACK_GOODS_ID"));
+ model.setDepFormBackId(back.getId());
+ model.setWhGoodsDetailsId(result1.getWh_goods_detail_id());
+ model.setUsingGoodsHisId(his.getId());
+ model.setWhGoodsId(his.getWhGoodsId());
+ model.setCounts(his.getThisCount());
+ model.setDepFormLendingModelId(his.getDepFormLendingModelId());
+ model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
+ model.setDepFormLendingId(his.getDepFormLendingId());
+ model.setWhGoodsId(his.getWhGoodsId());
+ insert(model);
+ }
+
+ }
+
+
+ }
+
+
+ /**
+ * 閮ㄩ棬鐗╁搧鍒嗗彂
+ */
+ public void doDepLending(DepFormLending lending){
+ String sql = "SELECT\n" +
+ " * \n" +
+ "FROM\n" +
+ " DEP_FORM_LENDING_GOODS A \n" +
+ "WHERE\n" +
+ " A.DEP_FORM_LENDING_ID = :LENDING_ID";
+
+ List<DepFormLendingGoods> goodsList = this.select(sql,new SqlParameter()
+ .put("LENDING_ID",lending.getId()),new DepFormLendingGoods());
+
+ for (DepFormLendingGoods goods : goodsList){
+ BaseWarehouseParam param = new BaseWarehouseParam();
+ param.setIsCheckIn(false);
+ param.setWarehouseId(lending.getWarehouseId());
+ param.setModelId(goods.getBaseGoodsModelsId());
+ param.setCount(goods.getCounts());
+
+ //棣栧厛浠庢満鏋勪粨搴撳嚭搴�
+ List<CheckWarehouseResult> results = coreService.unifyCheck(param);
+ for (CheckWarehouseResult result : results){
+ WhGoodsDetails details = new WhGoodsDetails();
+ details.setId(NumberGenerator.getLongSequenceNumber());
+ details.setBusinessFormId(lending.getId());
+ details.setBusinessFormCode(lending.getBusinessFormCode());
+ details.setBusinessFormName("鍒嗗彂鍗曪細" + lending.getBusinessFormCode());
+ details.setInitialCount(result.getInitial_count());
+ details.setThisType(2);
+ details.setThisCount(result.getInitial_count() - result.getEnd_count());
+ details.setEndCount(result.getEnd_count());
+ details.setWarehouseId(result.getWhGoods().getWarehouseId());
+ details.setWarehouseName(result.getWhGoods().getWarehouseName());
+ details.setClassification(11);
+ details.setOperatorId(lending.getOperatorId());
+ details.setOperatorName(lending.getOperatorName());
+ details.setDealTime(lending.getDealTime());
+ details.setWhGoodsId(result.getWhGoods().getId());
+ this.insert(details);
+
+ //鍥炲～鍑哄簱娴佹按ID锛岀敤浜庡垎鍙戞椂浣跨敤
+ result.setWh_goods_detail_id(details.getId());
+ }
+
+ CheckUsingParam usingParam = new CheckUsingParam();
+ usingParam.setIsCheckIn(true);
+ usingParam.setInput_type(1);
+ usingParam.setOutputList(results);
+
+ List<CheckUsingResult> usingResults = coreService.unifyUsingCheck(usingParam);
+ for (CheckUsingResult usingResult : usingResults) {
+ UsingGoodsHis his = new UsingGoodsHis();
+ his.setId(NumberGenerator.getLongSequenceNumber());
+ his.setBusinessFormId(lending.getId());
+ his.setBusinessFormCode(lending.getBusinessFormCode());
+ his.setBusinessFormName("鍒嗗彂鍗曪細" + lending.getBusinessFormCode());
+ his.setClassification(1);
+ his.setOperatorId(lending.getOperatorId());
+ his.setOperatorName(lending.getOperatorName());
+ his.setDealTime(lending.getDealTime());
+ his.setDepFormLendingModelId(usingResult.getLendingModel().getId());
+ his.setDepFormLendingGoodsId(usingResult.getLendingModel().getDepFormLendingGoodsId());
+ his.setDepFormLendingId(lending.getId());
+ his.setWhGoodsId(usingResult.getLendingModel().getWhGoodsId());
+ his.setInitialCount(usingResult.getInitial_count());
+ his.setEndCount(usingResult.getEnd_count());
+ his.setWarehouseId(lending.getWarehouseId());
+ his.setWarehouseName(lending.getWarehouseName());
+ his.setDepartmentId(lending.getDepartmentId());
+ his.setDepartmentName(lending.getDepartmentName());
+ insert(his);
+ }
+ }
+ }
+
+ public void doDepScrapped(String dep_form_scrapped_id){
+
+ DepFormScrapped scrapped = get(new DepFormScrapped(),"ID=?",new Object[]{dep_form_scrapped_id});
+
+ String sql = "SELECT\n" +
+ " B.*,\n" +
+ " A.SCRAPPED_COUNTS, \n" +
+ " A.ID AS DEP_FORM_SCRAPPED_GOODS_ID \n" +
+ "FROM\n" +
+ " DEP_FORM_SCRAPPED_GOODS A\n" +
+ " LEFT JOIN DEP_FORM_LENDING_GOODS B ON A.DEP_FORM_LENDING_GOODS_ID = B.ID \n" +
+ "WHERE\n" +
+ " A.DEP_FORM_SCRAPPED_ID = :DEP_FORM_SCRAPPED_ID \n" +
+ " AND A.WAREHOUSE_ID = B.WAREHOUSE_ID \n" +
+ " AND A.WAREHOUSE_ID = :WAREHOUSE_ID";
+
+ List<Map> list = select(sql,new SqlParameter("DEP_FORM_SCRAPPED_ID",scrapped.getId()).add("WAREHOUSE_ID",scrapped.getWarehouseId()));
+ for (Map _map : list) {
+ SuperMap map = new SuperMap(_map);
+
+ CheckUsingParam param = new CheckUsingParam();
+ param.setIsCheckIn(false);
+ param.setOutputCount(map.getInteger("SCRAPPED_COUNTS"));
+ param.setLending_id(map.getLong("DEP_FORM_LENDING_ID"));
+ param.setModel_id(map.getLong("BASE_GOODS_MODELS_ID"));
+ param.setUser_name(map.getString("GOODS_USER_NAME"));
+
+ List<CheckUsingResult> resultList = coreService.unifyUsingCheck(param);
+
+ for (CheckUsingResult result : resultList) {
+
+ //瀛樺叆鍦ㄧ敤娴佹按
+ UsingGoodsHis his = new UsingGoodsHis();
+ his.setId(NumberGenerator.getLongSequenceNumber());
+ his.setBusinessFormId(scrapped.getId());
+ his.setBusinessFormCode(scrapped.getBusinessFormCode());
+ his.setBusinessFormName("閮ㄩ棬鎶ュ簾鍗曪細" + scrapped.getBusinessFormCode());
+ his.setClassification(4);
+ his.setOperatorId(scrapped.getOperatorId());
+ his.setOperatorName(scrapped.getOperatorName());
+ his.setDealTime(scrapped.getDealTime());
+ his.setDepFormLendingModelId(result.getLendingModel().getId());
+ his.setDepFormLendingGoodsId(result.getLendingModel().getDepFormLendingGoodsId());
+ his.setDepFormLendingId(result.getLendingModel().getDepFormLendingId());
+ his.setWhGoodsId(result.getLendingModel().getWhGoodsId());
+ his.setInitialCount(result.getInitial_count());
+ his.setEndCount(result.getEnd_count());
+ his.setWarehouseId(scrapped.getWarehouseId());
+ his.setWarehouseName(scrapped.getWarehouseName());
+ his.setDepartmentId(scrapped.getDepartmentId());
+ his.setDepartmentName(scrapped.getDepartmentName());
+ insert(his);
+
+
+ DepFormScrappedModel model = new DepFormScrappedModel();
+ model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setDepFormScrappedGoodsId(map.getLong("DEP_FORM_SCRAPPED_GOODS_ID"));
+ model.setScrappedCode(map.getString("SCRAPPED_CODE"));
+ model.setScrappedName(map.getString("SCRAPPED_NAME"));
+ model.setUsingGoodsHisId(his.getId());
+ model.setDepFormScrappedId(scrapped.getId());
+ model.setWhGoodsId(his.getWhGoodsId());
+ model.setScrappedCounts(his.getThisCount());
+ model.setInitCount(his.getInitialCount());
+ model.setDepFormLendingModelId(his.getDepFormLendingModelId());
+ model.setDepFormLendingGoodsId(his.getDepFormLendingGoodsId());
+ model.setDepFormLendingId(his.getDepFormLendingId());
+ insert(model);
+ }
+ }
+ }
+
+ /**
+ * 鐢ㄤ簬鍙樻洿鐗╁搧浣跨敤浜哄悗锛屾洿鏂板簱瀛樼墿鍝佷娇鐢ㄤ汉淇℃伅銆�
+ * @param dep_form_lending_goods_user_id
+ */
+ public void changeUser(Long dep_form_lending_goods_user_id){
+ DepFormLendingGoodsUser user = get(new DepFormLendingGoodsUser(),"ID=?",new Object[]{dep_form_lending_goods_user_id});
+ DepFormLendingGoods goods = get(new DepFormLendingGoods(),"ID=?",new Object[]{user.getDepFormLendingGoodsId()});
+
+
+ String sql =
+ "UPDATE DEP_FORM_LENDING_MODEL \n" +
+ "SET NOW_USER_NAME =:NOW_USER_NAME,\n" +
+ "NOW_USER_PHONE =:NOW_USER_PHONE \n" +
+ "WHERE\n" +
+ " DEP_FORM_LENDING_GOODS_ID =:DEP_FORM_LENDING_GOODS_ID \n" +
+ " AND BASE_GOODS_MODELS_ID =:BASE_GOODS_MODELS_ID \n" +
+ " AND NOW_USER_NAME =:OLD_USER_NAME\n" +
+ " AND USING_COUNT > 0";
+
+ List<SqlParameter> parameterList = new ArrayList<>();
+ List<DepFormLendingModel> modelList = select(new DepFormLendingModel(),"DEP_FORM_LENDING_GOODS_ID=?",new Object[]{goods.getId()});
+ for (DepFormLendingModel model : modelList) {
+ if (model.getUsingCount() == 0) continue;
+ SqlParameter parameter = new SqlParameter();
+ parameter.add("NOW_USER_NAME",user.getNowUserName())
+ .add("NOW_USER_PHONE",user.getNowUserPhone())
+ .add("DEP_FORM_LENDING_GOODS_ID",goods.getId())
+ .add("BASE_GOODS_MODELS_ID",goods.getBaseGoodsModelsId())
+ .add("OLD_USER_NAME",goods.getGoodsUserName());
+ parameterList.add(parameter);
+ }
+ execBatchUpdate(sql,parameterList);
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java b/consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java
index 8252dc7..fb96208 100644
--- a/consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java
+++ b/consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java
@@ -116,13 +116,21 @@
*/
Scrapped_Using(9),
/**
- * 鍒嗗彂鍑哄簱
+ * 鏈烘瀯浠撳簱 鍒嗗彂鍑哄簱
*/
Lending_Out(10),
/**
- * 鍒嗗彂杩斿簱
+ * 鏈烘瀯浠撳簱 鍒嗗彂杩斿簱
*/
- Lending_Back(11);
+ Lending_Back(11),
+ /**
+ * 閮ㄩ棬浠撳簱 鍒嗗彂鍑哄簱
+ */
+ Dept_Lending_Out(12),
+ /**
+ * 閮ㄩ棬浠撳簱 鍒嗗彂杩斿簱
+ */
+ Dept_Lending_Back(13);
private int value;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
index 720aa82..8523934 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
@@ -31,13 +31,17 @@
private SimpleJdbcCall simpleJdbcCall;
private LWarehouseFlowService lWarehouseFlowService;
private LWhGoodsService lWhGoodsService;
+ private LWhFormTransferService lWhFormTransferService;
+ private LWhFormOutputCoreService lWhFormOutputCoreService;
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
@Autowired
- public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService) {
+ public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, LWhFormTransferService lWhFormTransferService, LWhFormOutputCoreService lWhFormOutputCoreService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService) {
this.jdbcTemplate = jdbcTemplate;
this.lWarehouseFlowService = lWarehouseFlowService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
+ this.lWhFormTransferService = lWhFormTransferService;
+ this.lWhFormOutputCoreService = lWhFormOutputCoreService;
this.lWhGoodsService = lWhGoodsService;
this.simpleJdbcCall = new SimpleJdbcCall(jdbcTemplate).withProcedureName("InsertL_WH_GOODS");
}
@@ -49,7 +53,7 @@
* @param warehouseFlow
* @return
*/
- public int insertWareFlow(List<LWhProcureModel> goodsModelNumList, LWhFormProcure lWhFormProcure, LWarehouseFlow warehouseFlow) {
+ public int buyInsertWareFlow(List<LWhProcureModel> goodsModelNumList, LWhFormProcure lWhFormProcure, LWarehouseFlow warehouseFlow) {
if (CollectionUtils.isEmpty(goodsModelNumList)) {
log.error("娌℃湁瑕佸叆搴撶殑鐗╁搧");
return 0;
@@ -115,7 +119,7 @@
Object warehouseModelLockObj = LockManage.acquireLock(warehouseId, baseGoodsModelsId);
synchronized (warehouseModelLockObj) {
// 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseId, baseGoodsModelsId, (short) 1);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseId, baseGoodsModelsId, (short) 1, null);
whGoodsRecord.setInitialCount(goodsModelNum);
whGoodsRecord.setThisCount(modelCount);
whGoodsRecord.setEndCount(goodsModelNum + modelCount);
@@ -186,4 +190,23 @@
Map<String, Object> out = simpleJdbcCall.execute(in);
System.out.println("Procedure result: " + out);
}
+
+ /**
+ * 璋冩嫧鍑哄簱
+ *
+ * @param outWarehouseId 鍑哄簱鍗�
+ * @return
+ */
+ public int outInsertWareFlow(Long outWarehouseId) {
+ // 鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
+// List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
+ // 淇敼鐗╁搧鐨勭姸鎬佷负 鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
+ // 淇敼 鎵�灞炰粨搴撲粨搴撶紪鍙稺AREHOUSE_ID銆佷粨搴撳悕绉癢AREHOUSE_NAME锛屾鏃朵笉瑕佸悓姝ヨ繘 鐗╁搧浠撳簱淇濈璁板綍銆怢_GOODS_WH_RECORD銆戯紒鍏ュ簱鏃跺啀鍚屾
+
+
+ // 鏂板璁板綍 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撱�怢_WH_GOODS_RECORD銆戣繘鍑哄簱娴佹按鏄庣粏[L_WH_GOODS_RECORD_DETAILS]
+
+
+ return 0;
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
new file mode 100644
index 0000000..49df2b7
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -0,0 +1,268 @@
+package com.consum.base.service;
+
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.param.BaseWarehouseParam1;
+import com.consum.base.core.util.LockManage;
+import com.consum.model.po.*;
+import com.iplatform.model.po.S_user_core;
+import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.NumberGenerator;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName WhFormOutputCoreService
+ * @Author cy
+ * @Date 2023/10/26
+ * @Description
+ * @Version 1.0
+ **/
+@Slf4j
+@Service
+public class LWhFormOutputCoreService {
+ @Resource
+ private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ @Resource
+ private LWhGoodsService lWhGoodsService;
+ @Resource
+ private CodeGeneratorService codeGeneratorService;
+ @Resource
+ private LWhProcureModelService lWhProcureModelService;
+ @Resource
+ private LWhFormTransferService lWhFormTransferService;
+ @Resource
+ private LWhFormOutputService lWhFormOutputService;
+ @Resource
+ private LWarehouseFlowService lWarehouseFlowService;
+
+ /**
+ * 鏍规嵁 璋冩嫧鍗� 鐢熸垚 鍑哄簱鍗�
+ *
+ * @param whFormTransferId 璋冩嫧鍗昳d
+ * @return 鍑哄簱鍗旾d
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long createOutFormByTransId(Long whFormTransferId, S_user_core currentUser) {
+ if (whFormTransferId == null) {
+ return null;
+ }
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
+ lWhFormTransfer = lWhFormTransferService.get(lWhFormTransfer);
+ if (lWhFormTransfer == null || lWhFormTransfer.getStates() != 0) {
+ log.error("璋冩嫧澶辫触锛佽妫�鏌ヨ皟鎷ㄥ崟鐘舵��");
+ return null;
+ }
+ //鐢宠璋冩嫧鐨勭墿鍝�
+ List<LWhProcureModel> goodsModelNumList = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, whFormTransferId);
+ if (CollectionUtils.isEmpty(goodsModelNumList)) {
+ log.error("娌℃湁瑕佸叆搴撶殑鐗╁搧");
+ return null;
+ }
+ Long outWarehouseId = lWhFormTransfer.getOutWarehouseId();
+ String outWarehouseName = lWhFormTransfer.getOutWarehouseName();
+
+ // 鍑哄簱鍗旾D
+ Long outWarehouseFormId = NumberGenerator.getLongSequenceNumberNano();
+
+ // 璋冩嫧鍗曠墿鍝� 宸茬粡鎸夊瀷鍙峰垎濂戒簡
+ goodsModelNumList.forEach(itemModelInfo -> {
+ // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
+ Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();
+ // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鏌愪釜鍨嬪彿鐨勬暟閲�
+ Integer counts = itemModelInfo.getCounts();
+ //閫氳繃LockManage鑾峰緱閿�
+ //鍥犱负鏄牴鎹皟鎷ㄧ敓鎴愮殑 鎵�浠ユ澶勪笉鐢ㄦ牎楠屽簱瀛�
+// Object warehouseModelLockObj = LockManage.acquireLock(outWarehouseId, baseGoodsModelsId);
+ // synchronized (warehouseModelLockObj) {
+ // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
+// int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType);
+// if (goodsModelNum < counts) {
+// log.error("鍑哄簱澶辫触锛佸瀷鍙穥} 鐨勬暟閲忎笉瓒筹紝闇�瑕佽皟鎷▄}涓紝浠撳簱涓幇瀛榹}涓�", baseGoodsModelsId, counts, goodsModelNum);
+// // 鎵嬪姩鍥炴粴
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// throw new RuntimeException("鍑哄簱澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
+// }
+ // 澶嶇敤瀵硅薄
+ itemModelInfo.setId(NumberGenerator.getLongSequenceNumber());
+ itemModelInfo.setFromProcureGoodsId(null);
+ itemModelInfo.setBusinessType(3);
+ itemModelInfo.setBusinessId(outWarehouseFormId);
+ itemModelInfo.setPrice(null);
+// itemModelInfo.setCounts(counts);
+// itemModelInfo.setWorehouseCount(goodsModelNum);
+ itemModelInfo.setSupplier(null);
+// }
+ });
+ lWhProcureModelService.insertBatch(goodsModelNumList);
+
+ // //鍒涘缓鍑哄簱鍗�
+ LWhFormOutput whFormOutput = new LWhFormOutput();
+
+ whFormOutput.setId(outWarehouseFormId);
+ // 姝ゆ椂骞舵病鏈夊嚭搴�
+ whFormOutput.setWarehouseFlowId(null);
+ whFormOutput.setBusinessFormCode(codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.OutPut_Warehouse.getValue(), 4));
+ //杩涘嚭搴撴祦姘存�昏〃 鍏ュ簱鍗旾D
+ whFormOutput.setInWarehouseFlowId(null);
+// 璋冩嫧鍗旾D(璋冩嫧鏃堕渶瑕�)
+ whFormOutput.setTransBusinessId(whFormTransferId);
+ whFormOutput.setOutputCode(BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue() + "");
+ whFormOutput.setOutputName("璋冩嫧鍑哄簱");
+ whFormOutput.setWarehouseId(outWarehouseId);
+ whFormOutput.setWarehouseName(outWarehouseName);
+ whFormOutput.setAgencyId(null);
+ whFormOutput.setAgencyName(null);
+ whFormOutput.setOperatorId(currentUser.getId());
+ whFormOutput.setOperatorName(currentUser.getNick_name());
+ long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+
+ whFormOutput.setDealTime(dealTime);
+ whFormOutput.setStates(1);
+ int insert = lWhFormOutputService.insert(whFormOutput);
+ if (insert == 0) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return null;
+ }
+
+ return outWarehouseFormId;
+ }
+
+
+ /**
+ * 鏍规嵁 鍑哄簱鍗� 鍑哄簱
+ *
+ * @param outWarehouseFormId 鍑哄簱鍗旾d
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long outFormByTransId(Long outWarehouseFormId, S_user_core currentUser) {
+ if (outWarehouseFormId == null) {
+ return null;
+ }
+ LWhFormOutput lWhFormOutput = new LWhFormOutput(outWarehouseFormId);
+ lWhFormOutput = lWhFormOutputService.get(lWhFormOutput);
+ if (lWhFormOutput == null || lWhFormOutput.getStates() != 1) {
+ log.error("鍑哄簱澶辫触锛佽妫�鏌ュ嚭搴撳崟鐘舵��");
+ return null;
+ }
+ //鐢宠璋冩嫧鐨勭墿鍝�
+ List<LWhProcureModel> goodsModelNumList = lWhProcureModelService.getModelByForm(WhBusinessEnum.CHUKU, outWarehouseFormId);
+ if (CollectionUtils.isEmpty(goodsModelNumList)) {
+ log.error("娌℃湁瑕佸嚭搴撶殑鐗╁搧");
+ return null;
+ }
+ // 瑕佸嚭鐗╁搧鐨勪粨搴搃d
+ Long outWarehouseId = lWhFormOutput.getWarehouseId();
+ String warehouseName = lWhFormOutput.getWarehouseName();
+
+ Long userId = currentUser.getId();
+ String nickName = currentUser.getNick_name();
+ long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+ // 娴佹按璁板綍鎬昏〃ID
+ long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();
+ // 娴佹按璁板綍鎬昏〃涓� 涓氬姟ID 銆傝皟鎷ㄥ崟鏃� 淇濆瓨璋冩嫧鍗昳d 鍑哄簱鍗曟椂 淇濆瓨鍑哄簱鍗昳d
+ long lWarehouseFlowBusinessId = outWarehouseFormId;
+
+ // 鐗╁搧鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
+ short queryModelStatusT = 1;
+ //閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
+ Short buyTypeT = null;
+ String outputCode = lWhFormOutput.getOutputCode();
+ if ((BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue() + "").equals(outputCode)) {
+ //璋冩嫧鍑哄簱
+ queryModelStatusT = 1;
+ buyTypeT = 1;
+ lWarehouseFlowBusinessId = lWhFormOutput.getTransBusinessId();
+ } else if ((BaseWarehouseParam1.In_OutPutTypeEnum.Dept_Lending_Out.getValue() + "").equals(outputCode)) {
+ // 閮ㄩ棬浠撳簱 鍒嗗彂鍑哄簱
+// queryModelStatusT = 2;
+ }
+ short queryModelStatus = queryModelStatusT;
+ Short buyType = buyTypeT;
+
+ goodsModelNumList.forEach(itemModelInfo -> {
+ // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
+ Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();
+ // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鏌愪釜鍨嬪彿鐨勬暟閲�
+ Integer counts = itemModelInfo.getCounts();
+
+ //鏌ヨ鍨嬪彿淇℃伅
+ Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId);
+ //浠峰�肩被鍨�
+ String classificationObj = (String) tempGoodsInfo.get("classification");
+ Short classificationT = 3;
+ if (classificationObj != null) {
+ classificationT = (short) ((classificationObj).charAt(0) - 64);
+ }
+ short classification = classificationT;
+ Long tempGoodsId = (Long) tempGoodsInfo.get("goodsid");
+ String goodsName = (String) tempGoodsInfo.get("goodsname");
+ String modelName = (String) tempGoodsInfo.get("modelname");
+ String goodsUnit = (String) tempGoodsInfo.get("unit");
+
+ // 鎻掑叆 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撹褰� L_WH_GOODS_RECORD
+ long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano();
+ LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord();
+ whGoodsRecord.setId(whGoodsRecordId);
+ whGoodsRecord.setWarehouseId(outWarehouseId);
+ whGoodsRecord.setWarehouseFlowId(lWarehouseFlowId);
+ whGoodsRecord.setBaseGoodsTemplateId(tempGoodsId);
+ whGoodsRecord.setGoodsTemplateName(goodsName);
+ whGoodsRecord.setBaseGoodsModelsId(baseGoodsModelsId);
+ whGoodsRecord.setBaseGoodsModelsName(modelName);
+ whGoodsRecord.setDealTime(dealTime);
+ //鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
+ whGoodsRecord.setThisType(2);
+ whGoodsRecord.setThisCount(counts);
+
+ //閫氳繃LockManage鑾峰緱閿�
+ Object warehouseModelLockObj = LockManage.acquireLock(outWarehouseId, baseGoodsModelsId);
+ synchronized (warehouseModelLockObj) {
+ // 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType);
+ if (goodsModelNum < counts) {
+ log.error("鍑哄簱澶辫触锛佸瀷鍙穥} 鐨勬暟閲忎笉瓒筹紝闇�瑕佽皟鎷▄}涓紝浠撳簱涓幇瀛榹}涓�", baseGoodsModelsId, counts, goodsModelNum);
+ // 鎵嬪姩鍥炴粴
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException("鍑哄簱澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
+ }
+ whGoodsRecord.setInitialCount(goodsModelNum);
+ whGoodsRecord.setEndCount(goodsModelNum - counts);
+
+ //鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
+ List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
+ outGoodsId.forEach(whGoodsId -> {
+
+ });
+
+ }
+
+ });
+ LWarehouseFlow warehouseFlow = new LWarehouseFlow();
+ warehouseFlow.setId(lWarehouseFlowId);
+ warehouseFlow.setWarehouseId(outWarehouseId);
+ warehouseFlow.setWarehouseName(warehouseName);
+ warehouseFlow.setThisType(2);
+ warehouseFlow.setBusinessType(WhBusinessEnum.DIAOBO.getValue() + 0);
+
+ warehouseFlow.setBusinessFormId(lWarehouseFlowBusinessId);
+ warehouseFlow.setOperatorId(userId);
+ warehouseFlow.setOperatorName(nickName);
+ warehouseFlow.setDealTime(dealTime);
+ // 鎻掑叆娴佹按鎬昏〃
+ int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);
+ if (flowInsertFlag == 0) {
+ return 0l;
+ }
+ return 1l;
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java
new file mode 100644
index 0000000..46e62c8
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputService.java
@@ -0,0 +1,18 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName WhFormOutputService
+ * @Author cy
+ * @Date 2023/10/26
+ * @Description
+ * @Version 1.0
+ **/
+@Slf4j
+@Service
+public class LWhFormOutputService extends BaseServiceImpl {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
new file mode 100644
index 0000000..db31877
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureCoreService.java
@@ -0,0 +1,79 @@
+package com.consum.base.service;
+
+import com.consum.base.core.WhBusinessEnum;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhProcureModel;
+import com.iplatform.model.po.S_user_core;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.NumberGenerator;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @ClassName LWhFormProcureCoreService
+ * @Author cy
+ * @Date 2023/10/26
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+@Slf4j
+public class LWhFormProcureCoreService {
+ @Resource
+ private LWhProcureModelService lWhProcureModelService;
+
+ @Resource
+ private LWhFormProcureService lWhFormProcureService;
+
+ @Resource
+ private LWarehouseFlowCoreService lWarehouseFlowService;
+
+ /**
+ * 鎵ц閲囪喘鍏ュ簱
+ * 绗竴姝ワ細閫氳繃閲囪喘鍗旾D鏌ヨ閲囪喘鍗曞瀷鍙枫�怢_WH_PROCURE_MODEL銆戝緱鍒板晢鍝佸瀷鍙蜂互鍙婃暟閲�
+ * 绗簩姝ワ細璁板綍杩涘嚭搴撴祦姘达細L_WAREHOUSE_FLOW
+ */
+ public void doProcure(Long whFormProcureId, S_user_core currentUser) {
+ //閲囪喘鍗曚俊鎭�
+ LWhFormProcure whFormProcure = new LWhFormProcure(whFormProcureId);
+ LWhFormProcure lWhFormProcure = lWhFormProcureService.get(whFormProcure);
+ if (lWhFormProcure == null || lWhFormProcure.getStates() != 0) {
+ log.error("鍏ュ簱澶辫触锛佽妫�鏌ュ叆搴撳崟鐘舵��");
+ return;
+ }
+ Long userId = currentUser.getId();
+ String nickName = currentUser.getNick_name();
+ long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+
+ List<LWhProcureModel> goodsModelNum = lWhProcureModelService.getModelByForm(WhBusinessEnum.CAIGOU, whFormProcureId);
+ // 娴佹按璁板綍鎬昏〃ID
+ long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();
+ LWarehouseFlow warehouseFlow = new LWarehouseFlow();
+ warehouseFlow.setId(lWarehouseFlowId);
+ warehouseFlow.setWarehouseId(lWhFormProcure.getWarehouseId());
+ warehouseFlow.setWarehouseName(lWhFormProcure.getWarehouseName());
+ warehouseFlow.setThisType(1);
+ warehouseFlow.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
+ warehouseFlow.setBusinessFormId(whFormProcureId);
+ warehouseFlow.setOperatorId(userId);
+ warehouseFlow.setOperatorName(nickName);
+ warehouseFlow.setDealTime(dealTime);
+ int flowInsertFlag = lWarehouseFlowService.buyInsertWareFlow(goodsModelNum, lWhFormProcure, warehouseFlow);
+ if (flowInsertFlag == 1) {
+ // 鏇存柊閲囪喘鍗曘�怢_WH_FORM_PROCURE銆�
+ whFormProcure.setStates(1);
+ whFormProcure.setLWarehouseFlowId(lWarehouseFlowId);
+ whFormProcure.setIncomeId(userId);
+ whFormProcure.setIncomeName(nickName);
+ whFormProcure.setIncomeTime(dealTime);
+ lWhFormProcureService.update(whFormProcure);
+ }
+ log.info("鍏ュ簱鍗曪細{} 鍏ュ簱瀹屾垚", whFormProcureId);
+ return;
+
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
new file mode 100644
index 0000000..70c38b4
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
@@ -0,0 +1,70 @@
+package com.consum.base.service;
+
+import com.consum.model.po.LWhFormTransfer;
+import com.iplatform.model.po.S_user_core;
+import com.walker.infrastructure.utils.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @ClassName LWhFormTransferCoreService
+ * @Author cy
+ * @Date 2023/10/26
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+@Slf4j
+public class LWhFormTransferCoreService {
+ @Resource
+ private LWhProcureModelService lWhProcureModelService;
+ @Resource
+ private LWhFormTransferService lWhFormTransferService;
+ @Resource
+ private LWarehouseFlowCoreService lWarehouseFlowService;
+ @Resource
+ private LWhFormOutputCoreService lWhFormOutputCoreService;
+
+
+ /**
+ * 鎵ц璋冩嫧鍑哄簱鎿嶄綔
+ * 1. 閫氳繃璋冩嫧鍗曘�怶H_FORM_TRANSFER銆� 纭畾璋冩嫧鍗曠墿鍝併�怢_WH_PROCURE_MODEL銆�
+ * 2. 鏍￠獙搴撳瓨
+ * 3. 鏇存柊杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW]銆佸悇瑙勬牸鐗╁搧鐨勮繘鍑哄簱銆怢_WH_GOODS_RECORD銆戙�佽繘鍑哄簱娴佹按鏄庣粏[L_WH_GOODS_RECORD_DETAILS]銆�
+ * 搴撳瓨鐗╁搧璇︽儏锛圠_WH_GOODS锛�
+ * 4. 鏇存柊璋冩嫧鍗曘�怶H_FORM_TRANSFER銆戜负寰呮帴鏀讹紝鏇存柊璋冩嫧鍗曠墿鍝併�怶H_FORM_TRANSFER_MODEL銆戝嚭搴撴祦姘碔D
+ *
+ * @param whFormTransferId 璋冩嫧鍗昳d
+ */
+ public void doTransferOutPut(Long whFormTransferId, S_user_core currentUser) {
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
+ lWhFormTransfer = lWhFormTransferService.get(lWhFormTransfer);
+ if (lWhFormTransfer == null || lWhFormTransfer.getStates() != 0) {
+ log.error("璋冩嫧澶辫触锛佽妫�鏌ヨ皟鎷ㄥ崟鐘舵��");
+ return;
+ }
+
+ Long userId = currentUser.getId();
+ String nickName = currentUser.getNick_name();
+ long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+
+ // 鍑哄簱鍗旾D
+ Long outWarehouseFormId = null;
+ try {
+ // 鏍规嵁璋冩嫧鍗� 鐢熸垚 鍑哄簱鍗�
+ outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ return;
+ }
+ // 鍑哄簱鍗� 鍑哄簱
+ Long aLong = lWhFormOutputCoreService.outFormByTransId(whFormTransferId, currentUser);
+
+
+ log.info("璋冩嫧鍗曪細{} 鍑哄簱瀹屾垚", whFormTransferId);
+ return;
+
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
new file mode 100644
index 0000000..e0583a8
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
@@ -0,0 +1,16 @@
+package com.consum.base.service;
+
+import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName LWhFormTransferService
+ * @Author cy
+ * @Date 2023/10/25
+ * @Description
+ * @Version 1.0
+ **/
+@Service
+public class LWhFormTransferService extends BaseServiceImpl {
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
index ab57d57..3275512 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
@@ -1,10 +1,13 @@
package com.consum.base.service;
+import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @ClassName LWhGoodsService
@@ -35,7 +38,7 @@
paramts.put("warehouseId", warehouseId);
}
if (baseGoodsModelsId != null) {
- sql.append(" and BASE_GOODS_TEMPLATE_ID=:businessId");
+ sql.append(" and BASE_GOODS_TEMPLATE_ID=:baseGoodsModelsId");
paramts.put("baseGoodsModelsId", baseGoodsModelsId);
}
if (states != null) {
@@ -48,4 +51,74 @@
}
return queryForInt(sql.toString(), paramts);
}
+
+
+ /**
+ * 鍑哄簱鏃跺�欙紝鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
+ *
+ * @param warehouseId 鎵�灞炰粨搴撲粨搴撶紪鍙�
+ * @param baseGoodsModelsId 瑙勬牸鍨嬪彿缂栧彿
+ * @param states 鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
+ * @param buyType 閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
+ * @param goodsModelNum 鍙栧嚭鐨勬暟閲�
+ * @return
+ */
+ private static String QUERY_OUT_GOODS_ID = "SELECT*FROM L_WH_GOODS WHERE 1=1";
+
+ public List<Map<String, Object>> queryOutGoods(Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType, Integer goodsModelNum) {
+ StringBuilder sql = new StringBuilder(QUERY_OUT_GOODS_ID);
+ Map<String, Object> paramts = new HashMap<>();
+ if (warehouseId != null) {
+ sql.append(" and WAREHOUSE_ID=:warehouseId");
+ paramts.put("warehouseId", warehouseId);
+ }
+ if (baseGoodsModelsId != null) {
+ sql.append(" and BASE_GOODS_TEMPLATE_ID=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", baseGoodsModelsId);
+ }
+ if (states != null) {
+ sql.append(" and STATES=:STATES");
+ paramts.put("states", states);
+ }
+ if (buyType != null) {
+ sql.append(" and BUY_TYPE=:buyType");
+ paramts.put("buyType", buyType);
+ }
+ return select(sql.append(" limit").append(goodsModelNum).toString(), paramts);
+ }
+
+
+ /**
+ * 鍑哄簱鏃跺�欙紝鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
+ *
+ * @param warehouseId 鎵�灞炰粨搴撲粨搴撶紪鍙�
+ * @param baseGoodsModelsId 瑙勬牸鍨嬪彿缂栧彿
+ * @param states 鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
+ * @param buyType 閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
+ * @param goodsModelNum 鍙栧嚭鐨勬暟閲�
+ * @return
+ */
+ public List<Long> queryOutGoodsId(Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType, Integer goodsModelNum) {
+ List<Map<String, Object>> outGoods = queryOutGoods(warehouseId, baseGoodsModelsId, states, buyType, goodsModelNum);
+ if (CollectionUtils.isEmpty(outGoods)) {
+ return null;
+ }
+ List<Long> whGoodsIds = outGoods.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());
+ return whGoodsIds;
+ }
+
+ /**
+ * 璁剧疆鐗╁搧鐘舵�佷负璋冩嫧涓�
+ *
+ * @param whGoods
+ * @param toWarehouseId
+ * @param toWarehouseName
+ * @return
+ */
+ private static String MOD_GOODS_TRANSFERING = "";
+
+ public int modGoodsTransfering(List<Long> whGoods, Long toWarehouseId, String toWarehouseName) {
+//upda
+ return 0;
+ }
}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow.java
index 02d7320..886443a 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow.java
@@ -28,9 +28,9 @@
@JsonIgnore
protected boolean isset_warehouseName = false;
- private Integer lastRecord = null;
+ private Integer thisType = null;
@JsonIgnore
- protected boolean isset_lastRecord = false;
+ protected boolean isset_thisType = false;
private Integer businessType = null;
@JsonIgnore
@@ -115,18 +115,18 @@
return this.warehouseName == null || this.warehouseName.length() == 0;
}
- public Integer getLastRecord() {
- return this.lastRecord;
+ public Integer getThisType() {
+ return this.thisType;
}
- public void setLastRecord(Integer lastRecord) {
- this.lastRecord = lastRecord;
- this.isset_lastRecord = true;
+ public void setThisType(Integer thisType) {
+ this.thisType = thisType;
+ this.isset_thisType = true;
}
@JsonIgnore
- public boolean isEmptyLastRecord() {
- return this.lastRecord == null;
+ public boolean isEmptyThisType() {
+ return this.thisType == null;
}
public Integer getBusinessType() {
@@ -208,7 +208,7 @@
.append("id=").append(this.id)
.append("warehouseId=").append(this.warehouseId)
.append("warehouseName=").append(this.warehouseName)
- .append("lastRecord=").append(this.lastRecord)
+ .append("thisType=").append(this.thisType)
.append("businessType=").append(this.businessType)
.append("businessFormId=").append(this.businessFormId)
.append("operatorId=").append(this.operatorId)
@@ -237,8 +237,8 @@
if (this.isset_warehouseName) {
l_warehouse_flow.setWarehouseName(this.getWarehouseName());
}
- if (this.isset_lastRecord) {
- l_warehouse_flow.setLastRecord(this.getLastRecord());
+ if (this.isset_thisType) {
+ l_warehouse_flow.setThisType(this.getThisType());
}
if (this.isset_businessType) {
l_warehouse_flow.setBusinessType(this.getBusinessType());
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java
index 6b28d09..140478d 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java
@@ -30,7 +30,7 @@
// 鏅�氬睘鎬�
public static final String WarehouseId = "warehouse_id";
public static final String WarehouseName = "warehouse_name";
- public static final String LastRecord = "last_record";
+ public static final String ThisType = "this_type";
public static final String BusinessType = "business_type";
public static final String BusinessFormId = "business_form_id";
public static final String OperatorId = "operator_id";
@@ -55,8 +55,8 @@
if (lWarehouseFlow.isset_warehouseName) {
this.setWarehouseName(lWarehouseFlow.getWarehouseName());
}
- if (lWarehouseFlow.isset_lastRecord) {
- this.setLastRecord(lWarehouseFlow.getLastRecord());
+ if (lWarehouseFlow.isset_thisType) {
+ this.setThisType(lWarehouseFlow.getThisType());
}
if (lWarehouseFlow.isset_businessType) {
this.setBusinessType(lWarehouseFlow.getBusinessType());
@@ -118,7 +118,7 @@
ib.set(Id, this.getId());
ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
- ib.set(LastRecord, this.getLastRecord(), this.isset_lastRecord);
+ ib.set(ThisType, this.getThisType(), this.isset_thisType);
ib.set(BusinessType, this.getBusinessType(), this.isset_businessType);
ib.set(BusinessFormId, this.getBusinessFormId(), this.isset_businessFormId);
ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -135,7 +135,7 @@
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
- ub.set(LastRecord, this.getLastRecord(), this.isset_lastRecord);
+ ub.set(ThisType, this.getThisType(), this.isset_thisType);
ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
ub.set(BusinessFormId, this.getBusinessFormId(), this.isset_businessFormId);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -153,7 +153,7 @@
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
- ub.set(LastRecord, this.getLastRecord(), this.isset_lastRecord);
+ ub.set(ThisType, this.getThisType(), this.isset_thisType);
ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
ub.set(BusinessFormId, this.getBusinessFormId(), this.isset_businessFormId);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -170,7 +170,7 @@
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
- ub.set(LastRecord, this.getLastRecord(), this.isset_lastRecord);
+ ub.set(ThisType, this.getThisType(), this.isset_thisType);
ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
ub.set(BusinessFormId, this.getBusinessFormId(), this.isset_businessFormId);
ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
@@ -223,7 +223,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, warehouse_id, warehouse_name, last_record, business_type, business_form_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_id, warehouse_name, this_type, business_type, business_form_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -231,7 +231,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, warehouse_id, warehouse_name, last_record, business_type, business_form_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, warehouse_id, warehouse_name, this_type, business_type, business_form_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -280,12 +280,12 @@
if (columnIndex > 0) {
l_warehouse_flow.setWarehouseName(rs.getString(columnIndex));
}
- columnIndex = resultSetUtils.findColumn(rs, LWarehouseFlow_mapper.LastRecord);
+ columnIndex = resultSetUtils.findColumn(rs, LWarehouseFlow_mapper.ThisType);
if (columnIndex > 0) {
if (rs.getBigDecimal(columnIndex) == null) {
- l_warehouse_flow.setLastRecord(null);
+ l_warehouse_flow.setThisType(null);
} else {
- l_warehouse_flow.setLastRecord(rs.getInt(columnIndex));
+ l_warehouse_flow.setThisType(rs.getInt(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, LWarehouseFlow_mapper.BusinessType);
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java
new file mode 100644
index 0000000..aec0b4f
--- /dev/null
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput.java
@@ -0,0 +1,414 @@
+
+package com.consum.model.po;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.walker.jdbc.BasePo;
+
+/**
+ * 琛ㄥ悕:L_WH_FORM_OUTPUT *
+ * @author genrator
+ */
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public class LWhFormOutput extends BasePo<LWhFormOutput> {
+ // 搴忓垪鍖栫増鏈彿
+ private static final long serialVersionUID = 1L;
+
+ // 涓婚敭
+ private Long id = null;
+ @JsonIgnore
+ protected boolean isset_id = false;
+
+ // 灞炴�у垪琛�
+ private Long warehouseFlowId = null;
+ @JsonIgnore
+ protected boolean isset_warehouseFlowId = false;
+
+ private String businessFormCode = null;
+ @JsonIgnore
+ protected boolean isset_businessFormCode = false;
+
+ private Long inWarehouseFlowId = null;
+ @JsonIgnore
+ protected boolean isset_inWarehouseFlowId = false;
+
+ private Long transBusinessId = null;
+ @JsonIgnore
+ protected boolean isset_transBusinessId = false;
+
+ private String outputCode = null;
+ @JsonIgnore
+ protected boolean isset_outputCode = false;
+
+ private String outputName = null;
+ @JsonIgnore
+ protected boolean isset_outputName = false;
+
+ private Long warehouseId = null;
+ @JsonIgnore
+ protected boolean isset_warehouseId = false;
+
+ private String warehouseName = null;
+ @JsonIgnore
+ protected boolean isset_warehouseName = false;
+
+ private Long agencyId = null;
+ @JsonIgnore
+ protected boolean isset_agencyId = false;
+
+ private String agencyName = null;
+ @JsonIgnore
+ protected boolean isset_agencyName = false;
+
+ private Long operatorId = null;
+ @JsonIgnore
+ protected boolean isset_operatorId = false;
+
+ private String operatorName = null;
+ @JsonIgnore
+ protected boolean isset_operatorName = false;
+
+ private Long dealTime = null;
+ @JsonIgnore
+ protected boolean isset_dealTime = false;
+
+ private Integer states = null;
+ @JsonIgnore
+ protected boolean isset_states = false;
+
+ private String beiz = null;
+ @JsonIgnore
+ protected boolean isset_beiz = false;
+
+ /**
+ * 榛樿鏋勯�犲嚱鏁�
+ */
+ public LWhFormOutput() {
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鏋勯�犲璞�
+ */
+ public LWhFormOutput(Long id) {
+ this.setId(id);
+ }
+
+ /**
+ * 璁剧疆涓婚敭鍊�
+ */
+ @Override
+ public void setPkValue(Object value) {
+ this.setId((Long) value);
+ }
+
+ public Long getId() {
+ return this.id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ this.isset_id = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyId() {
+ return this.id == null;
+ }
+
+ public Long getWarehouseFlowId() {
+ return this.warehouseFlowId;
+ }
+
+ public void setWarehouseFlowId(Long warehouseFlowId) {
+ this.warehouseFlowId = warehouseFlowId;
+ this.isset_warehouseFlowId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyWarehouseFlowId() {
+ return this.warehouseFlowId == null;
+ }
+
+ public String getBusinessFormCode() {
+ return this.businessFormCode;
+ }
+
+ public void setBusinessFormCode(String businessFormCode) {
+ this.businessFormCode = businessFormCode;
+ this.isset_businessFormCode = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyBusinessFormCode() {
+ return this.businessFormCode == null || this.businessFormCode.length() == 0;
+ }
+
+ public Long getInWarehouseFlowId() {
+ return this.inWarehouseFlowId;
+ }
+
+ public void setInWarehouseFlowId(Long inWarehouseFlowId) {
+ this.inWarehouseFlowId = inWarehouseFlowId;
+ this.isset_inWarehouseFlowId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInWarehouseFlowId() {
+ return this.inWarehouseFlowId == null;
+ }
+
+ public Long getTransBusinessId() {
+ return this.transBusinessId;
+ }
+
+ public void setTransBusinessId(Long transBusinessId) {
+ this.transBusinessId = transBusinessId;
+ this.isset_transBusinessId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyTransBusinessId() {
+ return this.transBusinessId == null;
+ }
+
+ public String getOutputCode() {
+ return this.outputCode;
+ }
+
+ public void setOutputCode(String outputCode) {
+ this.outputCode = outputCode;
+ this.isset_outputCode = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutputCode() {
+ return this.outputCode == null || this.outputCode.length() == 0;
+ }
+
+ public String getOutputName() {
+ return this.outputName;
+ }
+
+ public void setOutputName(String outputName) {
+ this.outputName = outputName;
+ this.isset_outputName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutputName() {
+ return this.outputName == null || this.outputName.length() == 0;
+ }
+
+ public Long getWarehouseId() {
+ return this.warehouseId;
+ }
+
+ public void setWarehouseId(Long warehouseId) {
+ this.warehouseId = warehouseId;
+ this.isset_warehouseId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyWarehouseId() {
+ return this.warehouseId == null;
+ }
+
+ public String getWarehouseName() {
+ return this.warehouseName;
+ }
+
+ public void setWarehouseName(String warehouseName) {
+ this.warehouseName = warehouseName;
+ this.isset_warehouseName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyWarehouseName() {
+ return this.warehouseName == null || this.warehouseName.length() == 0;
+ }
+
+ public Long getAgencyId() {
+ return this.agencyId;
+ }
+
+ public void setAgencyId(Long agencyId) {
+ this.agencyId = agencyId;
+ this.isset_agencyId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyAgencyId() {
+ return this.agencyId == null;
+ }
+
+ public String getAgencyName() {
+ return this.agencyName;
+ }
+
+ public void setAgencyName(String agencyName) {
+ this.agencyName = agencyName;
+ this.isset_agencyName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyAgencyName() {
+ return this.agencyName == null || this.agencyName.length() == 0;
+ }
+
+ public Long getOperatorId() {
+ return this.operatorId;
+ }
+
+ public void setOperatorId(Long operatorId) {
+ this.operatorId = operatorId;
+ this.isset_operatorId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOperatorId() {
+ return this.operatorId == null;
+ }
+
+ public String getOperatorName() {
+ return this.operatorName;
+ }
+
+ public void setOperatorName(String operatorName) {
+ this.operatorName = operatorName;
+ this.isset_operatorName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOperatorName() {
+ return this.operatorName == null || this.operatorName.length() == 0;
+ }
+
+ public Long getDealTime() {
+ return this.dealTime;
+ }
+
+ public void setDealTime(Long dealTime) {
+ this.dealTime = dealTime;
+ this.isset_dealTime = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyDealTime() {
+ return this.dealTime == null;
+ }
+
+ public Integer getStates() {
+ return this.states;
+ }
+
+ public void setStates(Integer states) {
+ this.states = states;
+ this.isset_states = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyStates() {
+ return this.states == null;
+ }
+
+ public String getBeiz() {
+ return this.beiz;
+ }
+
+ public void setBeiz(String beiz) {
+ this.beiz = beiz;
+ this.isset_beiz = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyBeiz() {
+ return this.beiz == null || this.beiz.length() == 0;
+ }
+
+ /**
+ * 閲嶅啓 toString() 鏂规硶
+ */
+ @Override
+ public String toString() {
+ return new StringBuilder()
+ .append("id=").append(this.id)
+ .append("warehouseFlowId=").append(this.warehouseFlowId)
+ .append("businessFormCode=").append(this.businessFormCode)
+ .append("inWarehouseFlowId=").append(this.inWarehouseFlowId)
+ .append("transBusinessId=").append(this.transBusinessId)
+ .append("outputCode=").append(this.outputCode)
+ .append("outputName=").append(this.outputName)
+ .append("warehouseId=").append(this.warehouseId)
+ .append("warehouseName=").append(this.warehouseName)
+ .append("agencyId=").append(this.agencyId)
+ .append("agencyName=").append(this.agencyName)
+ .append("operatorId=").append(this.operatorId)
+ .append("operatorName=").append(this.operatorName)
+ .append("dealTime=").append(this.dealTime)
+ .append("states=").append(this.states)
+ .append("beiz=").append(this.beiz)
+ .toString();
+ }
+
+ /**
+ * 鍏嬮殕
+ */
+ public LWhFormOutput $clone() {
+ LWhFormOutput l_wh_form_output = new LWhFormOutput();
+
+ // 鏁版嵁搴撳悕绉�
+ //l_wh_form_output.setDatabaseName_(this.getDatabaseName_());
+
+ // 涓婚敭
+ if (this.isset_id) {
+ l_wh_form_output.setId(this.getId());
+ }
+ // 鏅�氬睘鎬�
+ if (this.isset_warehouseFlowId) {
+ l_wh_form_output.setWarehouseFlowId(this.getWarehouseFlowId());
+ }
+ if (this.isset_businessFormCode) {
+ l_wh_form_output.setBusinessFormCode(this.getBusinessFormCode());
+ }
+ if (this.isset_inWarehouseFlowId) {
+ l_wh_form_output.setInWarehouseFlowId(this.getInWarehouseFlowId());
+ }
+ if (this.isset_transBusinessId) {
+ l_wh_form_output.setTransBusinessId(this.getTransBusinessId());
+ }
+ if (this.isset_outputCode) {
+ l_wh_form_output.setOutputCode(this.getOutputCode());
+ }
+ if (this.isset_outputName) {
+ l_wh_form_output.setOutputName(this.getOutputName());
+ }
+ if (this.isset_warehouseId) {
+ l_wh_form_output.setWarehouseId(this.getWarehouseId());
+ }
+ if (this.isset_warehouseName) {
+ l_wh_form_output.setWarehouseName(this.getWarehouseName());
+ }
+ if (this.isset_agencyId) {
+ l_wh_form_output.setAgencyId(this.getAgencyId());
+ }
+ if (this.isset_agencyName) {
+ l_wh_form_output.setAgencyName(this.getAgencyName());
+ }
+ if (this.isset_operatorId) {
+ l_wh_form_output.setOperatorId(this.getOperatorId());
+ }
+ if (this.isset_operatorName) {
+ l_wh_form_output.setOperatorName(this.getOperatorName());
+ }
+ if (this.isset_dealTime) {
+ l_wh_form_output.setDealTime(this.getDealTime());
+ }
+ if (this.isset_states) {
+ l_wh_form_output.setStates(this.getStates());
+ }
+ if (this.isset_beiz) {
+ l_wh_form_output.setBeiz(this.getBeiz());
+ }
+ return l_wh_form_output;
+ }
+}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java
new file mode 100644
index 0000000..ac3848c
--- /dev/null
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormOutput_mapper.java
@@ -0,0 +1,419 @@
+package com.consum.model.po;
+
+import com.walker.jdbc.BaseMapper;
+import com.walker.jdbc.ResultSetUtils;
+import com.walker.jdbc.SqlAndParameters;
+import com.walker.jdbc.sqlgen.DeleteBuilder;
+import com.walker.jdbc.sqlgen.InsertBuilder;
+import com.walker.jdbc.sqlgen.SelectBuilder;
+import com.walker.jdbc.sqlgen.UpdateBuilder;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Map;
+
+/**
+ * 琛ㄥ悕:L_WH_FORM_OUTPUT *
+ * @author genrator
+ */
+public class LWhFormOutput_mapper extends LWhFormOutput implements BaseMapper<LWhFormOutput> {
+ // 搴忓垪鍖栫増鏈彿
+ private static final long serialVersionUID = 1L;
+
+ public static final RowMapper<LWhFormOutput> ROW_MAPPER = new LWhFormOutputRowMapper();
+
+ // 涓婚敭
+ public static final String Id = "id";
+ // 鏅�氬睘鎬�
+ public static final String WarehouseFlowId = "warehouse_flow_id";
+ public static final String BusinessFormCode = "business_form_code";
+ public static final String InWarehouseFlowId = "in_warehouse_flow_id";
+ public static final String TransBusinessId = "trans_business_id";
+ public static final String OutputCode = "output_code";
+ public static final String OutputName = "output_name";
+ public static final String WarehouseId = "warehouse_id";
+ public static final String WarehouseName = "warehouse_name";
+ public static final String AgencyId = "agency_id";
+ public static final String AgencyName = "agency_name";
+ public static final String OperatorId = "operator_id";
+ public static final String OperatorName = "operator_name";
+ public static final String DealTime = "deal_time";
+ public static final String States = "states";
+ public static final String Beiz = "beiz";
+
+ /**
+ * 榛樿鏋勯�犲嚱鏁�
+ */
+ public LWhFormOutput_mapper(LWhFormOutput lWhFormOutput) {
+ if (lWhFormOutput == null) {
+ throw new IllegalArgumentException("po鍙傛暟涓嶅厑璁镐负绌猴紒");
+ }
+ //涓婚敭
+ if (lWhFormOutput.isset_id) {
+ this.setId(lWhFormOutput.getId());
+ }
+ //鏅�氬睘鎬�
+ if (lWhFormOutput.isset_warehouseFlowId) {
+ this.setWarehouseFlowId(lWhFormOutput.getWarehouseFlowId());
+ }
+ if (lWhFormOutput.isset_businessFormCode) {
+ this.setBusinessFormCode(lWhFormOutput.getBusinessFormCode());
+ }
+ if (lWhFormOutput.isset_inWarehouseFlowId) {
+ this.setInWarehouseFlowId(lWhFormOutput.getInWarehouseFlowId());
+ }
+ if (lWhFormOutput.isset_transBusinessId) {
+ this.setTransBusinessId(lWhFormOutput.getTransBusinessId());
+ }
+ if (lWhFormOutput.isset_outputCode) {
+ this.setOutputCode(lWhFormOutput.getOutputCode());
+ }
+ if (lWhFormOutput.isset_outputName) {
+ this.setOutputName(lWhFormOutput.getOutputName());
+ }
+ if (lWhFormOutput.isset_warehouseId) {
+ this.setWarehouseId(lWhFormOutput.getWarehouseId());
+ }
+ if (lWhFormOutput.isset_warehouseName) {
+ this.setWarehouseName(lWhFormOutput.getWarehouseName());
+ }
+ if (lWhFormOutput.isset_agencyId) {
+ this.setAgencyId(lWhFormOutput.getAgencyId());
+ }
+ if (lWhFormOutput.isset_agencyName) {
+ this.setAgencyName(lWhFormOutput.getAgencyName());
+ }
+ if (lWhFormOutput.isset_operatorId) {
+ this.setOperatorId(lWhFormOutput.getOperatorId());
+ }
+ if (lWhFormOutput.isset_operatorName) {
+ this.setOperatorName(lWhFormOutput.getOperatorName());
+ }
+ if (lWhFormOutput.isset_dealTime) {
+ this.setDealTime(lWhFormOutput.getDealTime());
+ }
+ if (lWhFormOutput.isset_states) {
+ this.setStates(lWhFormOutput.getStates());
+ }
+ if (lWhFormOutput.isset_beiz) {
+ this.setBeiz(lWhFormOutput.getBeiz());
+ }
+ // 鍘绘帀锛�2022-09-07
+ // this.setDatabaseName_(l_wh_form_output.getDatabaseName_());
+ }
+
+ /**
+ * 鑾峰彇琛ㄥ悕
+ */
+ @Override
+ public String getTableName_() {
+ String tableName = "l_wh_form_output";
+ /**
+ if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
+ return this.getDatabaseName_() + "." + tableName;
+ } else {
+ return tableName;
+ }
+ */
+ return tableName;
+ }
+
+ /**
+ * 鑾峰彇涓婚敭鍚嶇О
+ */
+ @Override
+ public String getPkName_() {
+ return Id;
+ }
+
+ /**
+ * 鑾峰彇涓婚敭鍊�
+ */
+ @Override
+ public Object getPkValue_() {
+ return this.getId();
+ }
+
+ /**
+ * 鑾峰彇鎻掑叆璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getInsertSql_() {
+ InsertBuilder ib = new InsertBuilder(this.getTableName_());
+ ib.set(Id, this.getId());
+ ib.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
+ ib.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ib.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
+ ib.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ib.set(OutputCode, this.getOutputCode(), this.isset_outputCode);
+ ib.set(OutputName, this.getOutputName(), this.isset_outputName);
+ ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
+ ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
+ ib.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
+ ib.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
+ ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ib.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ib.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ib.set(States, this.getStates(), this.isset_states);
+ ib.set(Beiz, this.getBeiz(), this.isset_beiz);
+ return ib.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
+ ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OutputCode, this.getOutputCode(), this.isset_outputCode);
+ ub.set(OutputName, this.getOutputName(), this.isset_outputName);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
+ ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
+ ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
+ ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ub.set(States, this.getStates(), this.isset_states);
+ ub.set(Beiz, this.getBeiz(), this.isset_beiz);
+ ub.where(this.getPkName_(), this.getPkValue_());
+ return ub.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
+ ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OutputCode, this.getOutputCode(), this.isset_outputCode);
+ ub.set(OutputName, this.getOutputName(), this.isset_outputName);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
+ ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
+ ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
+ ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ub.set(States, this.getStates(), this.isset_states);
+ ub.set(Beiz, this.getBeiz(), this.isset_beiz);
+ return ub.genMapSql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId);
+ ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(InWarehouseFlowId, this.getInWarehouseFlowId(), this.isset_inWarehouseFlowId);
+ ub.set(TransBusinessId, this.getTransBusinessId(), this.isset_transBusinessId);
+ ub.set(OutputCode, this.getOutputCode(), this.isset_outputCode);
+ ub.set(OutputName, this.getOutputName(), this.isset_outputName);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
+ ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
+ ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
+ ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(DealTime, this.getDealTime(), this.isset_dealTime);
+ ub.set(States, this.getStates(), this.isset_states);
+ ub.set(Beiz, this.getBeiz(), this.isset_beiz);
+ return ub.genArraySql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getDeleteSql_() {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ db.where(this.getPkName_(), this.getPkValue_());
+ return db.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getDeleteSql_(String where, Map<String, Object> parameters) {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ return db.genMapSql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getDeleteSql_(String where, Object[] parameters) {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ return db.genArraySql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍗曡鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getSingleSql_() {
+ SelectBuilder sb = new SelectBuilder(this.getTableName_());
+ sb.where(this.getPkName_(), this.getPkValue_());
+ return sb.genMapSql();
+ }
+
+
+ /**
+ * 鑾峰彇鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
+ return new SqlAndParameters<>("select id, warehouse_flow_id, business_form_code, in_warehouse_flow_id, trans_business_id, output_code, output_name, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
+ return new SqlAndParameters<>("select id, warehouse_flow_id, business_form_code, in_warehouse_flow_id, trans_business_id, output_code, output_name, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, states, beiz from " + this.getTableName_() + " " + where, parameters);
+ }
+
+ /**
+ * 灏唕esultset鐨勪竴琛岃浆鍖栦负po
+ */
+ @Override
+ public LWhFormOutput mapRow(ResultSet rs, int i) throws SQLException {
+ return ROW_MAPPER.mapRow(rs, i);
+ }
+
+ /**
+ * 鍏嬮殕
+ */
+ public LWhFormOutput toLWhFormOutput() {
+ return super.$clone();
+ }
+}
+
+/**
+ * l_wh_form_output RowMapper
+ *
+ * @author genrator
+ */
+class LWhFormOutputRowMapper implements RowMapper<LWhFormOutput> {
+
+ @Override
+ public LWhFormOutput mapRow(ResultSet rs, int i) throws SQLException {
+ ResultSetUtils resultSetUtils = new ResultSetUtils();
+ LWhFormOutput l_wh_form_output = new LWhFormOutput();
+ Integer columnIndex;
+ //涓婚敭
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.Id);
+ if (columnIndex > 0) {
+ l_wh_form_output.setId(rs.getLong(columnIndex));
+ }
+ //鏅�氬睘鎬�
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.WarehouseFlowId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setWarehouseFlowId(null);
+ } else {
+ l_wh_form_output.setWarehouseFlowId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.BusinessFormCode);
+ if (columnIndex > 0) {
+ l_wh_form_output.setBusinessFormCode(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.InWarehouseFlowId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setInWarehouseFlowId(null);
+ } else {
+ l_wh_form_output.setInWarehouseFlowId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.TransBusinessId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setTransBusinessId(null);
+ } else {
+ l_wh_form_output.setTransBusinessId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.OutputCode);
+ if (columnIndex > 0) {
+ l_wh_form_output.setOutputCode(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.OutputName);
+ if (columnIndex > 0) {
+ l_wh_form_output.setOutputName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.WarehouseId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setWarehouseId(null);
+ } else {
+ l_wh_form_output.setWarehouseId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.WarehouseName);
+ if (columnIndex > 0) {
+ l_wh_form_output.setWarehouseName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.AgencyId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setAgencyId(null);
+ } else {
+ l_wh_form_output.setAgencyId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.AgencyName);
+ if (columnIndex > 0) {
+ l_wh_form_output.setAgencyName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.OperatorId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setOperatorId(null);
+ } else {
+ l_wh_form_output.setOperatorId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.OperatorName);
+ if (columnIndex > 0) {
+ l_wh_form_output.setOperatorName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.DealTime);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setDealTime(null);
+ } else {
+ l_wh_form_output.setDealTime(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.States);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_output.setStates(null);
+ } else {
+ l_wh_form_output.setStates(rs.getInt(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormOutput_mapper.Beiz);
+ if (columnIndex > 0) {
+ l_wh_form_output.setBeiz(rs.getString(columnIndex));
+ }
+ return l_wh_form_output;
+ }
+}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure.java
index e9d558a..c00b5b7 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure.java
@@ -24,6 +24,10 @@
@JsonIgnore
protected boolean isset_businessFormCode = false;
+ private Long warehouseId = null;
+ @JsonIgnore
+ protected boolean isset_warehouseId = false;
+
private String warehouseName = null;
@JsonIgnore
protected boolean isset_warehouseName = false;
@@ -71,10 +75,6 @@
private Long incomeTime = null;
@JsonIgnore
protected boolean isset_incomeTime = false;
-
- private Long warehouseId = null;
- @JsonIgnore
- protected boolean isset_warehouseId = false;
private String beiz = null;
@JsonIgnore
@@ -131,6 +131,20 @@
@JsonIgnore
public boolean isEmptyBusinessFormCode() {
return this.businessFormCode == null || this.businessFormCode.length() == 0;
+ }
+
+ public Long getWarehouseId() {
+ return this.warehouseId;
+ }
+
+ public void setWarehouseId(Long warehouseId) {
+ this.warehouseId = warehouseId;
+ this.isset_warehouseId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyWarehouseId() {
+ return this.warehouseId == null;
}
public String getWarehouseName() {
@@ -301,20 +315,6 @@
return this.incomeTime == null;
}
- public Long getWarehouseId() {
- return this.warehouseId;
- }
-
- public void setWarehouseId(Long warehouseId) {
- this.warehouseId = warehouseId;
- this.isset_warehouseId = true;
- }
-
- @JsonIgnore
- public boolean isEmptyWarehouseId() {
- return this.warehouseId == null;
- }
-
public String getBeiz() {
return this.beiz;
}
@@ -351,6 +351,7 @@
return new StringBuilder()
.append("id=").append(this.id)
.append("businessFormCode=").append(this.businessFormCode)
+ .append("warehouseId=").append(this.warehouseId)
.append("warehouseName=").append(this.warehouseName)
.append("buyerId=").append(this.buyerId)
.append("buyerName=").append(this.buyerName)
@@ -363,7 +364,6 @@
.append("incomeId=").append(this.incomeId)
.append("incomeName=").append(this.incomeName)
.append("incomeTime=").append(this.incomeTime)
- .append("warehouseId=").append(this.warehouseId)
.append("beiz=").append(this.beiz)
.append("lWarehouseFlowId=").append(this.lWarehouseFlowId)
.toString();
@@ -385,6 +385,9 @@
// 鏅�氬睘鎬�
if (this.isset_businessFormCode) {
l_wh_form_procure.setBusinessFormCode(this.getBusinessFormCode());
+ }
+ if (this.isset_warehouseId) {
+ l_wh_form_procure.setWarehouseId(this.getWarehouseId());
}
if (this.isset_warehouseName) {
l_wh_form_procure.setWarehouseName(this.getWarehouseName());
@@ -421,9 +424,6 @@
}
if (this.isset_incomeTime) {
l_wh_form_procure.setIncomeTime(this.getIncomeTime());
- }
- if (this.isset_warehouseId) {
- l_wh_form_procure.setWarehouseId(this.getWarehouseId());
}
if (this.isset_beiz) {
l_wh_form_procure.setBeiz(this.getBeiz());
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure_mapper.java
index 5762b0a..990b471 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormProcure_mapper.java
@@ -29,6 +29,7 @@
public static final String Id = "id";
// 鏅�氬睘鎬�
public static final String BusinessFormCode = "business_form_code";
+ public static final String WarehouseId = "warehouse_id";
public static final String WarehouseName = "warehouse_name";
public static final String BuyerId = "buyer_id";
public static final String BuyerName = "buyer_name";
@@ -41,7 +42,6 @@
public static final String IncomeId = "income_id";
public static final String IncomeName = "income_name";
public static final String IncomeTime = "income_time";
- public static final String WarehouseId = "warehouse_id";
public static final String Beiz = "beiz";
public static final String LWarehouseFlowId = "l_warehouse_flow_id";
@@ -59,6 +59,9 @@
//鏅�氬睘鎬�
if (lWhFormProcure.isset_businessFormCode) {
this.setBusinessFormCode(lWhFormProcure.getBusinessFormCode());
+ }
+ if (lWhFormProcure.isset_warehouseId) {
+ this.setWarehouseId(lWhFormProcure.getWarehouseId());
}
if (lWhFormProcure.isset_warehouseName) {
this.setWarehouseName(lWhFormProcure.getWarehouseName());
@@ -95,9 +98,6 @@
}
if (lWhFormProcure.isset_incomeTime) {
this.setIncomeTime(lWhFormProcure.getIncomeTime());
- }
- if (lWhFormProcure.isset_warehouseId) {
- this.setWarehouseId(lWhFormProcure.getWarehouseId());
}
if (lWhFormProcure.isset_beiz) {
this.setBeiz(lWhFormProcure.getBeiz());
@@ -149,6 +149,7 @@
InsertBuilder ib = new InsertBuilder(this.getTableName_());
ib.set(Id, this.getId());
ib.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
ib.set(BuyerId, this.getBuyerId(), this.isset_buyerId);
ib.set(BuyerName, this.getBuyerName(), this.isset_buyerName);
@@ -161,7 +162,6 @@
ib.set(IncomeId, this.getIncomeId(), this.isset_incomeId);
ib.set(IncomeName, this.getIncomeName(), this.isset_incomeName);
ib.set(IncomeTime, this.getIncomeTime(), this.isset_incomeTime);
- ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ib.set(Beiz, this.getBeiz(), this.isset_beiz);
ib.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
return ib.genMapSql();
@@ -174,6 +174,7 @@
public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
ub.set(BuyerId, this.getBuyerId(), this.isset_buyerId);
ub.set(BuyerName, this.getBuyerName(), this.isset_buyerName);
@@ -186,7 +187,6 @@
ub.set(IncomeId, this.getIncomeId(), this.isset_incomeId);
ub.set(IncomeName, this.getIncomeName(), this.isset_incomeName);
ub.set(IncomeTime, this.getIncomeTime(), this.isset_incomeTime);
- ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(Beiz, this.getBeiz(), this.isset_beiz);
ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
ub.where(this.getPkName_(), this.getPkValue_());
@@ -200,6 +200,7 @@
public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
ub.set(BuyerId, this.getBuyerId(), this.isset_buyerId);
ub.set(BuyerName, this.getBuyerName(), this.isset_buyerName);
@@ -212,7 +213,6 @@
ub.set(IncomeId, this.getIncomeId(), this.isset_incomeId);
ub.set(IncomeName, this.getIncomeName(), this.isset_incomeName);
ub.set(IncomeTime, this.getIncomeTime(), this.isset_incomeTime);
- ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(Beiz, this.getBeiz(), this.isset_beiz);
ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
return ub.genMapSql(where, parameters);
@@ -225,6 +225,7 @@
public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName);
ub.set(BuyerId, this.getBuyerId(), this.isset_buyerId);
ub.set(BuyerName, this.getBuyerName(), this.isset_buyerName);
@@ -237,7 +238,6 @@
ub.set(IncomeId, this.getIncomeId(), this.isset_incomeId);
ub.set(IncomeName, this.getIncomeName(), this.isset_incomeName);
ub.set(IncomeTime, this.getIncomeTime(), this.isset_incomeTime);
- ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId);
ub.set(Beiz, this.getBeiz(), this.isset_beiz);
ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId);
return ub.genArraySql(where, parameters);
@@ -287,7 +287,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, business_form_code, warehouse_name, buyer_id, buyer_name, procure_time, procure_doc, buy_type, states, agency_id, agency_name, income_id, income_name, income_time, warehouse_id, beiz, l_warehouse_flow_id from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, business_form_code, warehouse_id, warehouse_name, buyer_id, buyer_name, procure_time, procure_doc, buy_type, states, agency_id, agency_name, income_id, income_name, income_time, beiz, l_warehouse_flow_id from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -295,7 +295,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, business_form_code, warehouse_name, buyer_id, buyer_name, procure_time, procure_doc, buy_type, states, agency_id, agency_name, income_id, income_name, income_time, warehouse_id, beiz, l_warehouse_flow_id from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, business_form_code, warehouse_id, warehouse_name, buyer_id, buyer_name, procure_time, procure_doc, buy_type, states, agency_id, agency_name, income_id, income_name, income_time, beiz, l_warehouse_flow_id from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -335,6 +335,14 @@
columnIndex = resultSetUtils.findColumn(rs, LWhFormProcure_mapper.BusinessFormCode);
if (columnIndex > 0) {
l_wh_form_procure.setBusinessFormCode(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormProcure_mapper.WarehouseId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_procure.setWarehouseId(null);
+ } else {
+ l_wh_form_procure.setWarehouseId(rs.getLong(columnIndex));
+ }
}
columnIndex = resultSetUtils.findColumn(rs, LWhFormProcure_mapper.WarehouseName);
if (columnIndex > 0) {
@@ -410,14 +418,6 @@
l_wh_form_procure.setIncomeTime(null);
} else {
l_wh_form_procure.setIncomeTime(rs.getLong(columnIndex));
- }
- }
- columnIndex = resultSetUtils.findColumn(rs, LWhFormProcure_mapper.WarehouseId);
- if (columnIndex > 0) {
- if (rs.getBigDecimal(columnIndex) == null) {
- l_wh_form_procure.setWarehouseId(null);
- } else {
- l_wh_form_procure.setWarehouseId(rs.getLong(columnIndex));
}
}
columnIndex = resultSetUtils.findColumn(rs, LWhFormProcure_mapper.Beiz);
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java
new file mode 100644
index 0000000..8b3f978
--- /dev/null
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer.java
@@ -0,0 +1,656 @@
+
+package com.consum.model.po;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.walker.jdbc.BasePo;
+
+/**
+ * 琛ㄥ悕:L_WH_FORM_TRANSFER *
+ * @author genrator
+ */
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public class LWhFormTransfer extends BasePo<LWhFormTransfer> {
+ // 搴忓垪鍖栫増鏈彿
+ private static final long serialVersionUID = 1L;
+
+ // 涓婚敭
+ private Long id = null;
+ @JsonIgnore
+ protected boolean isset_id = false;
+
+ // 灞炴�у垪琛�
+ private Long inWarehouseFormId = null;
+ @JsonIgnore
+ protected boolean isset_inWarehouseFormId = false;
+
+ private Long outWarehouseFormId = null;
+ @JsonIgnore
+ protected boolean isset_outWarehouseFormId = false;
+
+ private Integer businessType = null;
+ @JsonIgnore
+ protected boolean isset_businessType = false;
+
+ private String businessFormCode = null;
+ @JsonIgnore
+ protected boolean isset_businessFormCode = false;
+
+ private Long inWarehouseId = null;
+ @JsonIgnore
+ protected boolean isset_inWarehouseId = false;
+
+ private String inWarehouseName = null;
+ @JsonIgnore
+ protected boolean isset_inWarehouseName = false;
+
+ private Long outWarehouseId = null;
+ @JsonIgnore
+ protected boolean isset_outWarehouseId = false;
+
+ private String outWarehouseName = null;
+ @JsonIgnore
+ protected boolean isset_outWarehouseName = false;
+
+ private Long inAgencyId = null;
+ @JsonIgnore
+ protected boolean isset_inAgencyId = false;
+
+ private String inAgencyName = null;
+ @JsonIgnore
+ protected boolean isset_inAgencyName = false;
+
+ private Long outAgencyId = null;
+ @JsonIgnore
+ protected boolean isset_outAgencyId = false;
+
+ private String outAgencyName = null;
+ @JsonIgnore
+ protected boolean isset_outAgencyName = false;
+
+ private Long operatorId = null;
+ @JsonIgnore
+ protected boolean isset_operatorId = false;
+
+ private String operatorName = null;
+ @JsonIgnore
+ protected boolean isset_operatorName = false;
+
+ private Long createTime = null;
+ @JsonIgnore
+ protected boolean isset_createTime = false;
+
+ private Integer states = null;
+ @JsonIgnore
+ protected boolean isset_states = false;
+
+ private Long inOperatorId = null;
+ @JsonIgnore
+ protected boolean isset_inOperatorId = false;
+
+ private String inOperatorName = null;
+ @JsonIgnore
+ protected boolean isset_inOperatorName = false;
+
+ private Long inTime = null;
+ @JsonIgnore
+ protected boolean isset_inTime = false;
+
+ private Long outOperatorId = null;
+ @JsonIgnore
+ protected boolean isset_outOperatorId = false;
+
+ private String outOperatorName = null;
+ @JsonIgnore
+ protected boolean isset_outOperatorName = false;
+
+ private Long outputTime = null;
+ @JsonIgnore
+ protected boolean isset_outputTime = false;
+
+ private String beiz1 = null;
+ @JsonIgnore
+ protected boolean isset_beiz1 = false;
+
+ private String beiz2 = null;
+ @JsonIgnore
+ protected boolean isset_beiz2 = false;
+
+ private String beiz3 = null;
+ @JsonIgnore
+ protected boolean isset_beiz3 = false;
+
+ private String procureDoc = null;
+ @JsonIgnore
+ protected boolean isset_procureDoc = false;
+
+ /**
+ * 榛樿鏋勯�犲嚱鏁�
+ */
+ public LWhFormTransfer() {
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鏋勯�犲璞�
+ */
+ public LWhFormTransfer(Long id) {
+ this.setId(id);
+ }
+
+ /**
+ * 璁剧疆涓婚敭鍊�
+ */
+ @Override
+ public void setPkValue(Object value) {
+ this.setId((Long) value);
+ }
+
+ public Long getId() {
+ return this.id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ this.isset_id = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyId() {
+ return this.id == null;
+ }
+
+ public Long getInWarehouseFormId() {
+ return this.inWarehouseFormId;
+ }
+
+ public void setInWarehouseFormId(Long inWarehouseFormId) {
+ this.inWarehouseFormId = inWarehouseFormId;
+ this.isset_inWarehouseFormId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInWarehouseFormId() {
+ return this.inWarehouseFormId == null;
+ }
+
+ public Long getOutWarehouseFormId() {
+ return this.outWarehouseFormId;
+ }
+
+ public void setOutWarehouseFormId(Long outWarehouseFormId) {
+ this.outWarehouseFormId = outWarehouseFormId;
+ this.isset_outWarehouseFormId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutWarehouseFormId() {
+ return this.outWarehouseFormId == null;
+ }
+
+ public Integer getBusinessType() {
+ return this.businessType;
+ }
+
+ public void setBusinessType(Integer businessType) {
+ this.businessType = businessType;
+ this.isset_businessType = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyBusinessType() {
+ return this.businessType == null;
+ }
+
+ public String getBusinessFormCode() {
+ return this.businessFormCode;
+ }
+
+ public void setBusinessFormCode(String businessFormCode) {
+ this.businessFormCode = businessFormCode;
+ this.isset_businessFormCode = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyBusinessFormCode() {
+ return this.businessFormCode == null || this.businessFormCode.length() == 0;
+ }
+
+ public Long getInWarehouseId() {
+ return this.inWarehouseId;
+ }
+
+ public void setInWarehouseId(Long inWarehouseId) {
+ this.inWarehouseId = inWarehouseId;
+ this.isset_inWarehouseId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInWarehouseId() {
+ return this.inWarehouseId == null;
+ }
+
+ public String getInWarehouseName() {
+ return this.inWarehouseName;
+ }
+
+ public void setInWarehouseName(String inWarehouseName) {
+ this.inWarehouseName = inWarehouseName;
+ this.isset_inWarehouseName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInWarehouseName() {
+ return this.inWarehouseName == null || this.inWarehouseName.length() == 0;
+ }
+
+ public Long getOutWarehouseId() {
+ return this.outWarehouseId;
+ }
+
+ public void setOutWarehouseId(Long outWarehouseId) {
+ this.outWarehouseId = outWarehouseId;
+ this.isset_outWarehouseId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutWarehouseId() {
+ return this.outWarehouseId == null;
+ }
+
+ public String getOutWarehouseName() {
+ return this.outWarehouseName;
+ }
+
+ public void setOutWarehouseName(String outWarehouseName) {
+ this.outWarehouseName = outWarehouseName;
+ this.isset_outWarehouseName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutWarehouseName() {
+ return this.outWarehouseName == null || this.outWarehouseName.length() == 0;
+ }
+
+ public Long getInAgencyId() {
+ return this.inAgencyId;
+ }
+
+ public void setInAgencyId(Long inAgencyId) {
+ this.inAgencyId = inAgencyId;
+ this.isset_inAgencyId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInAgencyId() {
+ return this.inAgencyId == null;
+ }
+
+ public String getInAgencyName() {
+ return this.inAgencyName;
+ }
+
+ public void setInAgencyName(String inAgencyName) {
+ this.inAgencyName = inAgencyName;
+ this.isset_inAgencyName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInAgencyName() {
+ return this.inAgencyName == null || this.inAgencyName.length() == 0;
+ }
+
+ public Long getOutAgencyId() {
+ return this.outAgencyId;
+ }
+
+ public void setOutAgencyId(Long outAgencyId) {
+ this.outAgencyId = outAgencyId;
+ this.isset_outAgencyId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutAgencyId() {
+ return this.outAgencyId == null;
+ }
+
+ public String getOutAgencyName() {
+ return this.outAgencyName;
+ }
+
+ public void setOutAgencyName(String outAgencyName) {
+ this.outAgencyName = outAgencyName;
+ this.isset_outAgencyName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutAgencyName() {
+ return this.outAgencyName == null || this.outAgencyName.length() == 0;
+ }
+
+ public Long getOperatorId() {
+ return this.operatorId;
+ }
+
+ public void setOperatorId(Long operatorId) {
+ this.operatorId = operatorId;
+ this.isset_operatorId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOperatorId() {
+ return this.operatorId == null;
+ }
+
+ public String getOperatorName() {
+ return this.operatorName;
+ }
+
+ public void setOperatorName(String operatorName) {
+ this.operatorName = operatorName;
+ this.isset_operatorName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOperatorName() {
+ return this.operatorName == null || this.operatorName.length() == 0;
+ }
+
+ public Long getCreateTime() {
+ return this.createTime;
+ }
+
+ public void setCreateTime(Long createTime) {
+ this.createTime = createTime;
+ this.isset_createTime = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyCreateTime() {
+ return this.createTime == null;
+ }
+
+ public Integer getStates() {
+ return this.states;
+ }
+
+ public void setStates(Integer states) {
+ this.states = states;
+ this.isset_states = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyStates() {
+ return this.states == null;
+ }
+
+ public Long getInOperatorId() {
+ return this.inOperatorId;
+ }
+
+ public void setInOperatorId(Long inOperatorId) {
+ this.inOperatorId = inOperatorId;
+ this.isset_inOperatorId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInOperatorId() {
+ return this.inOperatorId == null;
+ }
+
+ public String getInOperatorName() {
+ return this.inOperatorName;
+ }
+
+ public void setInOperatorName(String inOperatorName) {
+ this.inOperatorName = inOperatorName;
+ this.isset_inOperatorName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInOperatorName() {
+ return this.inOperatorName == null || this.inOperatorName.length() == 0;
+ }
+
+ public Long getInTime() {
+ return this.inTime;
+ }
+
+ public void setInTime(Long inTime) {
+ this.inTime = inTime;
+ this.isset_inTime = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyInTime() {
+ return this.inTime == null;
+ }
+
+ public Long getOutOperatorId() {
+ return this.outOperatorId;
+ }
+
+ public void setOutOperatorId(Long outOperatorId) {
+ this.outOperatorId = outOperatorId;
+ this.isset_outOperatorId = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutOperatorId() {
+ return this.outOperatorId == null;
+ }
+
+ public String getOutOperatorName() {
+ return this.outOperatorName;
+ }
+
+ public void setOutOperatorName(String outOperatorName) {
+ this.outOperatorName = outOperatorName;
+ this.isset_outOperatorName = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutOperatorName() {
+ return this.outOperatorName == null || this.outOperatorName.length() == 0;
+ }
+
+ public Long getOutputTime() {
+ return this.outputTime;
+ }
+
+ public void setOutputTime(Long outputTime) {
+ this.outputTime = outputTime;
+ this.isset_outputTime = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyOutputTime() {
+ return this.outputTime == null;
+ }
+
+ public String getBeiz1() {
+ return this.beiz1;
+ }
+
+ public void setBeiz1(String beiz1) {
+ this.beiz1 = beiz1;
+ this.isset_beiz1 = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyBeiz1() {
+ return this.beiz1 == null || this.beiz1.length() == 0;
+ }
+
+ public String getBeiz2() {
+ return this.beiz2;
+ }
+
+ public void setBeiz2(String beiz2) {
+ this.beiz2 = beiz2;
+ this.isset_beiz2 = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyBeiz2() {
+ return this.beiz2 == null || this.beiz2.length() == 0;
+ }
+
+ public String getBeiz3() {
+ return this.beiz3;
+ }
+
+ public void setBeiz3(String beiz3) {
+ this.beiz3 = beiz3;
+ this.isset_beiz3 = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyBeiz3() {
+ return this.beiz3 == null || this.beiz3.length() == 0;
+ }
+
+ public String getProcureDoc() {
+ return this.procureDoc;
+ }
+
+ public void setProcureDoc(String procureDoc) {
+ this.procureDoc = procureDoc;
+ this.isset_procureDoc = true;
+ }
+
+ @JsonIgnore
+ public boolean isEmptyProcureDoc() {
+ return this.procureDoc == null || this.procureDoc.length() == 0;
+ }
+
+ /**
+ * 閲嶅啓 toString() 鏂规硶
+ */
+ @Override
+ public String toString() {
+ return new StringBuilder()
+ .append("id=").append(this.id)
+ .append("inWarehouseFormId=").append(this.inWarehouseFormId)
+ .append("outWarehouseFormId=").append(this.outWarehouseFormId)
+ .append("businessType=").append(this.businessType)
+ .append("businessFormCode=").append(this.businessFormCode)
+ .append("inWarehouseId=").append(this.inWarehouseId)
+ .append("inWarehouseName=").append(this.inWarehouseName)
+ .append("outWarehouseId=").append(this.outWarehouseId)
+ .append("outWarehouseName=").append(this.outWarehouseName)
+ .append("inAgencyId=").append(this.inAgencyId)
+ .append("inAgencyName=").append(this.inAgencyName)
+ .append("outAgencyId=").append(this.outAgencyId)
+ .append("outAgencyName=").append(this.outAgencyName)
+ .append("operatorId=").append(this.operatorId)
+ .append("operatorName=").append(this.operatorName)
+ .append("createTime=").append(this.createTime)
+ .append("states=").append(this.states)
+ .append("inOperatorId=").append(this.inOperatorId)
+ .append("inOperatorName=").append(this.inOperatorName)
+ .append("inTime=").append(this.inTime)
+ .append("outOperatorId=").append(this.outOperatorId)
+ .append("outOperatorName=").append(this.outOperatorName)
+ .append("outputTime=").append(this.outputTime)
+ .append("beiz1=").append(this.beiz1)
+ .append("beiz2=").append(this.beiz2)
+ .append("beiz3=").append(this.beiz3)
+ .append("procureDoc=").append(this.procureDoc)
+ .toString();
+ }
+
+ /**
+ * 鍏嬮殕
+ */
+ public LWhFormTransfer $clone() {
+ LWhFormTransfer l_wh_form_transfer = new LWhFormTransfer();
+
+ // 鏁版嵁搴撳悕绉�
+ //l_wh_form_transfer.setDatabaseName_(this.getDatabaseName_());
+
+ // 涓婚敭
+ if (this.isset_id) {
+ l_wh_form_transfer.setId(this.getId());
+ }
+ // 鏅�氬睘鎬�
+ if (this.isset_inWarehouseFormId) {
+ l_wh_form_transfer.setInWarehouseFormId(this.getInWarehouseFormId());
+ }
+ if (this.isset_outWarehouseFormId) {
+ l_wh_form_transfer.setOutWarehouseFormId(this.getOutWarehouseFormId());
+ }
+ if (this.isset_businessType) {
+ l_wh_form_transfer.setBusinessType(this.getBusinessType());
+ }
+ if (this.isset_businessFormCode) {
+ l_wh_form_transfer.setBusinessFormCode(this.getBusinessFormCode());
+ }
+ if (this.isset_inWarehouseId) {
+ l_wh_form_transfer.setInWarehouseId(this.getInWarehouseId());
+ }
+ if (this.isset_inWarehouseName) {
+ l_wh_form_transfer.setInWarehouseName(this.getInWarehouseName());
+ }
+ if (this.isset_outWarehouseId) {
+ l_wh_form_transfer.setOutWarehouseId(this.getOutWarehouseId());
+ }
+ if (this.isset_outWarehouseName) {
+ l_wh_form_transfer.setOutWarehouseName(this.getOutWarehouseName());
+ }
+ if (this.isset_inAgencyId) {
+ l_wh_form_transfer.setInAgencyId(this.getInAgencyId());
+ }
+ if (this.isset_inAgencyName) {
+ l_wh_form_transfer.setInAgencyName(this.getInAgencyName());
+ }
+ if (this.isset_outAgencyId) {
+ l_wh_form_transfer.setOutAgencyId(this.getOutAgencyId());
+ }
+ if (this.isset_outAgencyName) {
+ l_wh_form_transfer.setOutAgencyName(this.getOutAgencyName());
+ }
+ if (this.isset_operatorId) {
+ l_wh_form_transfer.setOperatorId(this.getOperatorId());
+ }
+ if (this.isset_operatorName) {
+ l_wh_form_transfer.setOperatorName(this.getOperatorName());
+ }
+ if (this.isset_createTime) {
+ l_wh_form_transfer.setCreateTime(this.getCreateTime());
+ }
+ if (this.isset_states) {
+ l_wh_form_transfer.setStates(this.getStates());
+ }
+ if (this.isset_inOperatorId) {
+ l_wh_form_transfer.setInOperatorId(this.getInOperatorId());
+ }
+ if (this.isset_inOperatorName) {
+ l_wh_form_transfer.setInOperatorName(this.getInOperatorName());
+ }
+ if (this.isset_inTime) {
+ l_wh_form_transfer.setInTime(this.getInTime());
+ }
+ if (this.isset_outOperatorId) {
+ l_wh_form_transfer.setOutOperatorId(this.getOutOperatorId());
+ }
+ if (this.isset_outOperatorName) {
+ l_wh_form_transfer.setOutOperatorName(this.getOutOperatorName());
+ }
+ if (this.isset_outputTime) {
+ l_wh_form_transfer.setOutputTime(this.getOutputTime());
+ }
+ if (this.isset_beiz1) {
+ l_wh_form_transfer.setBeiz1(this.getBeiz1());
+ }
+ if (this.isset_beiz2) {
+ l_wh_form_transfer.setBeiz2(this.getBeiz2());
+ }
+ if (this.isset_beiz3) {
+ l_wh_form_transfer.setBeiz3(this.getBeiz3());
+ }
+ if (this.isset_procureDoc) {
+ l_wh_form_transfer.setProcureDoc(this.getProcureDoc());
+ }
+ return l_wh_form_transfer;
+ }
+}
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java
new file mode 100644
index 0000000..90ac848
--- /dev/null
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormTransfer_mapper.java
@@ -0,0 +1,575 @@
+package com.consum.model.po;
+
+import com.walker.jdbc.BaseMapper;
+import com.walker.jdbc.ResultSetUtils;
+import com.walker.jdbc.SqlAndParameters;
+import com.walker.jdbc.sqlgen.DeleteBuilder;
+import com.walker.jdbc.sqlgen.InsertBuilder;
+import com.walker.jdbc.sqlgen.SelectBuilder;
+import com.walker.jdbc.sqlgen.UpdateBuilder;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Map;
+
+/**
+ * 琛ㄥ悕:L_WH_FORM_TRANSFER *
+ * @author genrator
+ */
+public class LWhFormTransfer_mapper extends LWhFormTransfer implements BaseMapper<LWhFormTransfer> {
+ // 搴忓垪鍖栫増鏈彿
+ private static final long serialVersionUID = 1L;
+
+ public static final RowMapper<LWhFormTransfer> ROW_MAPPER = new LWhFormTransferRowMapper();
+
+ // 涓婚敭
+ public static final String Id = "id";
+ // 鏅�氬睘鎬�
+ public static final String InWarehouseFormId = "in_warehouse_form_id";
+ public static final String OutWarehouseFormId = "out_warehouse_form_id";
+ public static final String BusinessType = "business_type";
+ public static final String BusinessFormCode = "business_form_code";
+ public static final String InWarehouseId = "in_warehouse_id";
+ public static final String InWarehouseName = "in_warehouse_name";
+ public static final String OutWarehouseId = "out_warehouse_id";
+ public static final String OutWarehouseName = "out_warehouse_name";
+ public static final String InAgencyId = "in_agency_id";
+ public static final String InAgencyName = "in_agency_name";
+ public static final String OutAgencyId = "out_agency_id";
+ public static final String OutAgencyName = "out_agency_name";
+ public static final String OperatorId = "operator_id";
+ public static final String OperatorName = "operator_name";
+ public static final String CreateTime = "create_time";
+ public static final String States = "states";
+ public static final String InOperatorId = "in_operator_id";
+ public static final String InOperatorName = "in_operator_name";
+ public static final String InTime = "in_time";
+ public static final String OutOperatorId = "out_operator_id";
+ public static final String OutOperatorName = "out_operator_name";
+ public static final String OutputTime = "output_time";
+ public static final String Beiz1 = "beiz1";
+ public static final String Beiz2 = "beiz2";
+ public static final String Beiz3 = "beiz3";
+ public static final String ProcureDoc = "procure_doc";
+
+ /**
+ * 榛樿鏋勯�犲嚱鏁�
+ */
+ public LWhFormTransfer_mapper(LWhFormTransfer lWhFormTransfer) {
+ if (lWhFormTransfer == null) {
+ throw new IllegalArgumentException("po鍙傛暟涓嶅厑璁镐负绌猴紒");
+ }
+ //涓婚敭
+ if (lWhFormTransfer.isset_id) {
+ this.setId(lWhFormTransfer.getId());
+ }
+ //鏅�氬睘鎬�
+ if (lWhFormTransfer.isset_inWarehouseFormId) {
+ this.setInWarehouseFormId(lWhFormTransfer.getInWarehouseFormId());
+ }
+ if (lWhFormTransfer.isset_outWarehouseFormId) {
+ this.setOutWarehouseFormId(lWhFormTransfer.getOutWarehouseFormId());
+ }
+ if (lWhFormTransfer.isset_businessType) {
+ this.setBusinessType(lWhFormTransfer.getBusinessType());
+ }
+ if (lWhFormTransfer.isset_businessFormCode) {
+ this.setBusinessFormCode(lWhFormTransfer.getBusinessFormCode());
+ }
+ if (lWhFormTransfer.isset_inWarehouseId) {
+ this.setInWarehouseId(lWhFormTransfer.getInWarehouseId());
+ }
+ if (lWhFormTransfer.isset_inWarehouseName) {
+ this.setInWarehouseName(lWhFormTransfer.getInWarehouseName());
+ }
+ if (lWhFormTransfer.isset_outWarehouseId) {
+ this.setOutWarehouseId(lWhFormTransfer.getOutWarehouseId());
+ }
+ if (lWhFormTransfer.isset_outWarehouseName) {
+ this.setOutWarehouseName(lWhFormTransfer.getOutWarehouseName());
+ }
+ if (lWhFormTransfer.isset_inAgencyId) {
+ this.setInAgencyId(lWhFormTransfer.getInAgencyId());
+ }
+ if (lWhFormTransfer.isset_inAgencyName) {
+ this.setInAgencyName(lWhFormTransfer.getInAgencyName());
+ }
+ if (lWhFormTransfer.isset_outAgencyId) {
+ this.setOutAgencyId(lWhFormTransfer.getOutAgencyId());
+ }
+ if (lWhFormTransfer.isset_outAgencyName) {
+ this.setOutAgencyName(lWhFormTransfer.getOutAgencyName());
+ }
+ if (lWhFormTransfer.isset_operatorId) {
+ this.setOperatorId(lWhFormTransfer.getOperatorId());
+ }
+ if (lWhFormTransfer.isset_operatorName) {
+ this.setOperatorName(lWhFormTransfer.getOperatorName());
+ }
+ if (lWhFormTransfer.isset_createTime) {
+ this.setCreateTime(lWhFormTransfer.getCreateTime());
+ }
+ if (lWhFormTransfer.isset_states) {
+ this.setStates(lWhFormTransfer.getStates());
+ }
+ if (lWhFormTransfer.isset_inOperatorId) {
+ this.setInOperatorId(lWhFormTransfer.getInOperatorId());
+ }
+ if (lWhFormTransfer.isset_inOperatorName) {
+ this.setInOperatorName(lWhFormTransfer.getInOperatorName());
+ }
+ if (lWhFormTransfer.isset_inTime) {
+ this.setInTime(lWhFormTransfer.getInTime());
+ }
+ if (lWhFormTransfer.isset_outOperatorId) {
+ this.setOutOperatorId(lWhFormTransfer.getOutOperatorId());
+ }
+ if (lWhFormTransfer.isset_outOperatorName) {
+ this.setOutOperatorName(lWhFormTransfer.getOutOperatorName());
+ }
+ if (lWhFormTransfer.isset_outputTime) {
+ this.setOutputTime(lWhFormTransfer.getOutputTime());
+ }
+ if (lWhFormTransfer.isset_beiz1) {
+ this.setBeiz1(lWhFormTransfer.getBeiz1());
+ }
+ if (lWhFormTransfer.isset_beiz2) {
+ this.setBeiz2(lWhFormTransfer.getBeiz2());
+ }
+ if (lWhFormTransfer.isset_beiz3) {
+ this.setBeiz3(lWhFormTransfer.getBeiz3());
+ }
+ if (lWhFormTransfer.isset_procureDoc) {
+ this.setProcureDoc(lWhFormTransfer.getProcureDoc());
+ }
+ // 鍘绘帀锛�2022-09-07
+ // this.setDatabaseName_(l_wh_form_transfer.getDatabaseName_());
+ }
+
+ /**
+ * 鑾峰彇琛ㄥ悕
+ */
+ @Override
+ public String getTableName_() {
+ String tableName = "l_wh_form_transfer";
+ /**
+ if (StringUtils.isNotEmpty(this.getDatabaseName_())) {
+ return this.getDatabaseName_() + "." + tableName;
+ } else {
+ return tableName;
+ }
+ */
+ return tableName;
+ }
+
+ /**
+ * 鑾峰彇涓婚敭鍚嶇О
+ */
+ @Override
+ public String getPkName_() {
+ return Id;
+ }
+
+ /**
+ * 鑾峰彇涓婚敭鍊�
+ */
+ @Override
+ public Object getPkValue_() {
+ return this.getId();
+ }
+
+ /**
+ * 鑾峰彇鎻掑叆璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getInsertSql_() {
+ InsertBuilder ib = new InsertBuilder(this.getTableName_());
+ ib.set(Id, this.getId());
+ ib.set(InWarehouseFormId, this.getInWarehouseFormId(), this.isset_inWarehouseFormId);
+ ib.set(OutWarehouseFormId, this.getOutWarehouseFormId(), this.isset_outWarehouseFormId);
+ ib.set(BusinessType, this.getBusinessType(), this.isset_businessType);
+ ib.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ib.set(InWarehouseId, this.getInWarehouseId(), this.isset_inWarehouseId);
+ ib.set(InWarehouseName, this.getInWarehouseName(), this.isset_inWarehouseName);
+ ib.set(OutWarehouseId, this.getOutWarehouseId(), this.isset_outWarehouseId);
+ ib.set(OutWarehouseName, this.getOutWarehouseName(), this.isset_outWarehouseName);
+ ib.set(InAgencyId, this.getInAgencyId(), this.isset_inAgencyId);
+ ib.set(InAgencyName, this.getInAgencyName(), this.isset_inAgencyName);
+ ib.set(OutAgencyId, this.getOutAgencyId(), this.isset_outAgencyId);
+ ib.set(OutAgencyName, this.getOutAgencyName(), this.isset_outAgencyName);
+ ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ib.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ib.set(CreateTime, this.getCreateTime(), this.isset_createTime);
+ ib.set(States, this.getStates(), this.isset_states);
+ ib.set(InOperatorId, this.getInOperatorId(), this.isset_inOperatorId);
+ ib.set(InOperatorName, this.getInOperatorName(), this.isset_inOperatorName);
+ ib.set(InTime, this.getInTime(), this.isset_inTime);
+ ib.set(OutOperatorId, this.getOutOperatorId(), this.isset_outOperatorId);
+ ib.set(OutOperatorName, this.getOutOperatorName(), this.isset_outOperatorName);
+ ib.set(OutputTime, this.getOutputTime(), this.isset_outputTime);
+ ib.set(Beiz1, this.getBeiz1(), this.isset_beiz1);
+ ib.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
+ ib.set(Beiz3, this.getBeiz3(), this.isset_beiz3);
+ ib.set(ProcureDoc, this.getProcureDoc(), this.isset_procureDoc);
+ return ib.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getUpdateSql_() {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(InWarehouseFormId, this.getInWarehouseFormId(), this.isset_inWarehouseFormId);
+ ub.set(OutWarehouseFormId, this.getOutWarehouseFormId(), this.isset_outWarehouseFormId);
+ ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
+ ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(InWarehouseId, this.getInWarehouseId(), this.isset_inWarehouseId);
+ ub.set(InWarehouseName, this.getInWarehouseName(), this.isset_inWarehouseName);
+ ub.set(OutWarehouseId, this.getOutWarehouseId(), this.isset_outWarehouseId);
+ ub.set(OutWarehouseName, this.getOutWarehouseName(), this.isset_outWarehouseName);
+ ub.set(InAgencyId, this.getInAgencyId(), this.isset_inAgencyId);
+ ub.set(InAgencyName, this.getInAgencyName(), this.isset_inAgencyName);
+ ub.set(OutAgencyId, this.getOutAgencyId(), this.isset_outAgencyId);
+ ub.set(OutAgencyName, this.getOutAgencyName(), this.isset_outAgencyName);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
+ ub.set(States, this.getStates(), this.isset_states);
+ ub.set(InOperatorId, this.getInOperatorId(), this.isset_inOperatorId);
+ ub.set(InOperatorName, this.getInOperatorName(), this.isset_inOperatorName);
+ ub.set(InTime, this.getInTime(), this.isset_inTime);
+ ub.set(OutOperatorId, this.getOutOperatorId(), this.isset_outOperatorId);
+ ub.set(OutOperatorName, this.getOutOperatorName(), this.isset_outOperatorName);
+ ub.set(OutputTime, this.getOutputTime(), this.isset_outputTime);
+ ub.set(Beiz1, this.getBeiz1(), this.isset_beiz1);
+ ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
+ ub.set(Beiz3, this.getBeiz3(), this.isset_beiz3);
+ ub.set(ProcureDoc, this.getProcureDoc(), this.isset_procureDoc);
+ ub.where(this.getPkName_(), this.getPkValue_());
+ return ub.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(InWarehouseFormId, this.getInWarehouseFormId(), this.isset_inWarehouseFormId);
+ ub.set(OutWarehouseFormId, this.getOutWarehouseFormId(), this.isset_outWarehouseFormId);
+ ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
+ ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(InWarehouseId, this.getInWarehouseId(), this.isset_inWarehouseId);
+ ub.set(InWarehouseName, this.getInWarehouseName(), this.isset_inWarehouseName);
+ ub.set(OutWarehouseId, this.getOutWarehouseId(), this.isset_outWarehouseId);
+ ub.set(OutWarehouseName, this.getOutWarehouseName(), this.isset_outWarehouseName);
+ ub.set(InAgencyId, this.getInAgencyId(), this.isset_inAgencyId);
+ ub.set(InAgencyName, this.getInAgencyName(), this.isset_inAgencyName);
+ ub.set(OutAgencyId, this.getOutAgencyId(), this.isset_outAgencyId);
+ ub.set(OutAgencyName, this.getOutAgencyName(), this.isset_outAgencyName);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
+ ub.set(States, this.getStates(), this.isset_states);
+ ub.set(InOperatorId, this.getInOperatorId(), this.isset_inOperatorId);
+ ub.set(InOperatorName, this.getInOperatorName(), this.isset_inOperatorName);
+ ub.set(InTime, this.getInTime(), this.isset_inTime);
+ ub.set(OutOperatorId, this.getOutOperatorId(), this.isset_outOperatorId);
+ ub.set(OutOperatorName, this.getOutOperatorName(), this.isset_outOperatorName);
+ ub.set(OutputTime, this.getOutputTime(), this.isset_outputTime);
+ ub.set(Beiz1, this.getBeiz1(), this.isset_beiz1);
+ ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
+ ub.set(Beiz3, this.getBeiz3(), this.isset_beiz3);
+ ub.set(ProcureDoc, this.getProcureDoc(), this.isset_procureDoc);
+ return ub.genMapSql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鏇存柊璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) {
+ UpdateBuilder ub = new UpdateBuilder(this.getTableName_());
+ ub.set(InWarehouseFormId, this.getInWarehouseFormId(), this.isset_inWarehouseFormId);
+ ub.set(OutWarehouseFormId, this.getOutWarehouseFormId(), this.isset_outWarehouseFormId);
+ ub.set(BusinessType, this.getBusinessType(), this.isset_businessType);
+ ub.set(BusinessFormCode, this.getBusinessFormCode(), this.isset_businessFormCode);
+ ub.set(InWarehouseId, this.getInWarehouseId(), this.isset_inWarehouseId);
+ ub.set(InWarehouseName, this.getInWarehouseName(), this.isset_inWarehouseName);
+ ub.set(OutWarehouseId, this.getOutWarehouseId(), this.isset_outWarehouseId);
+ ub.set(OutWarehouseName, this.getOutWarehouseName(), this.isset_outWarehouseName);
+ ub.set(InAgencyId, this.getInAgencyId(), this.isset_inAgencyId);
+ ub.set(InAgencyName, this.getInAgencyName(), this.isset_inAgencyName);
+ ub.set(OutAgencyId, this.getOutAgencyId(), this.isset_outAgencyId);
+ ub.set(OutAgencyName, this.getOutAgencyName(), this.isset_outAgencyName);
+ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId);
+ ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName);
+ ub.set(CreateTime, this.getCreateTime(), this.isset_createTime);
+ ub.set(States, this.getStates(), this.isset_states);
+ ub.set(InOperatorId, this.getInOperatorId(), this.isset_inOperatorId);
+ ub.set(InOperatorName, this.getInOperatorName(), this.isset_inOperatorName);
+ ub.set(InTime, this.getInTime(), this.isset_inTime);
+ ub.set(OutOperatorId, this.getOutOperatorId(), this.isset_outOperatorId);
+ ub.set(OutOperatorName, this.getOutOperatorName(), this.isset_outOperatorName);
+ ub.set(OutputTime, this.getOutputTime(), this.isset_outputTime);
+ ub.set(Beiz1, this.getBeiz1(), this.isset_beiz1);
+ ub.set(Beiz2, this.getBeiz2(), this.isset_beiz2);
+ ub.set(Beiz3, this.getBeiz3(), this.isset_beiz3);
+ ub.set(ProcureDoc, this.getProcureDoc(), this.isset_procureDoc);
+ return ub.genArraySql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getDeleteSql_() {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ db.where(this.getPkName_(), this.getPkValue_());
+ return db.genMapSql();
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getDeleteSql_(String where, Map<String, Object> parameters) {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ return db.genMapSql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍒犻櫎璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getDeleteSql_(String where, Object[] parameters) {
+ DeleteBuilder db = new DeleteBuilder(this.getTableName_());
+ return db.genArraySql(where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鍗曡鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getSingleSql_() {
+ SelectBuilder sb = new SelectBuilder(this.getTableName_());
+ sb.where(this.getPkName_(), this.getPkValue_());
+ return sb.genMapSql();
+ }
+
+
+ /**
+ * 鑾峰彇鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
+ return new SqlAndParameters<>("select id, in_warehouse_form_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_id, in_warehouse_name, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
+ }
+
+ /**
+ * 鑾峰彇鏌ヨ璇彞鍜屽弬鏁�
+ */
+ @Override
+ public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
+ return new SqlAndParameters<>("select id, in_warehouse_form_id, out_warehouse_form_id, business_type, business_form_code, in_warehouse_id, in_warehouse_name, out_warehouse_id, out_warehouse_name, in_agency_id, in_agency_name, out_agency_id, out_agency_name, operator_id, operator_name, create_time, states, in_operator_id, in_operator_name, in_time, out_operator_id, out_operator_name, output_time, beiz1, beiz2, beiz3, procure_doc from " + this.getTableName_() + " " + where, parameters);
+ }
+
+ /**
+ * 灏唕esultset鐨勪竴琛岃浆鍖栦负po
+ */
+ @Override
+ public LWhFormTransfer mapRow(ResultSet rs, int i) throws SQLException {
+ return ROW_MAPPER.mapRow(rs, i);
+ }
+
+ /**
+ * 鍏嬮殕
+ */
+ public LWhFormTransfer toLWhFormTransfer() {
+ return super.$clone();
+ }
+}
+
+/**
+ * l_wh_form_transfer RowMapper
+ *
+ * @author genrator
+ */
+class LWhFormTransferRowMapper implements RowMapper<LWhFormTransfer> {
+
+ @Override
+ public LWhFormTransfer mapRow(ResultSet rs, int i) throws SQLException {
+ ResultSetUtils resultSetUtils = new ResultSetUtils();
+ LWhFormTransfer l_wh_form_transfer = new LWhFormTransfer();
+ Integer columnIndex;
+ //涓婚敭
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.Id);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setId(rs.getLong(columnIndex));
+ }
+ //鏅�氬睘鎬�
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InWarehouseFormId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setInWarehouseFormId(null);
+ } else {
+ l_wh_form_transfer.setInWarehouseFormId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutWarehouseFormId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setOutWarehouseFormId(null);
+ } else {
+ l_wh_form_transfer.setOutWarehouseFormId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.BusinessType);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setBusinessType(null);
+ } else {
+ l_wh_form_transfer.setBusinessType(rs.getInt(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.BusinessFormCode);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setBusinessFormCode(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InWarehouseId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setInWarehouseId(null);
+ } else {
+ l_wh_form_transfer.setInWarehouseId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InWarehouseName);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setInWarehouseName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutWarehouseId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setOutWarehouseId(null);
+ } else {
+ l_wh_form_transfer.setOutWarehouseId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutWarehouseName);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setOutWarehouseName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InAgencyId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setInAgencyId(null);
+ } else {
+ l_wh_form_transfer.setInAgencyId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InAgencyName);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setInAgencyName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutAgencyId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setOutAgencyId(null);
+ } else {
+ l_wh_form_transfer.setOutAgencyId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutAgencyName);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setOutAgencyName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OperatorId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setOperatorId(null);
+ } else {
+ l_wh_form_transfer.setOperatorId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OperatorName);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setOperatorName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.CreateTime);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setCreateTime(null);
+ } else {
+ l_wh_form_transfer.setCreateTime(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.States);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setStates(null);
+ } else {
+ l_wh_form_transfer.setStates(rs.getInt(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InOperatorId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setInOperatorId(null);
+ } else {
+ l_wh_form_transfer.setInOperatorId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InOperatorName);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setInOperatorName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.InTime);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setInTime(null);
+ } else {
+ l_wh_form_transfer.setInTime(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutOperatorId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setOutOperatorId(null);
+ } else {
+ l_wh_form_transfer.setOutOperatorId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutOperatorName);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setOutOperatorName(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.OutputTime);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ l_wh_form_transfer.setOutputTime(null);
+ } else {
+ l_wh_form_transfer.setOutputTime(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.Beiz1);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setBeiz1(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.Beiz2);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setBeiz2(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.Beiz3);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setBeiz3(rs.getString(columnIndex));
+ }
+ columnIndex = resultSetUtils.findColumn(rs, LWhFormTransfer_mapper.ProcureDoc);
+ if (columnIndex > 0) {
+ l_wh_form_transfer.setProcureDoc(rs.getString(columnIndex));
+ }
+ return l_wh_form_transfer;
+ }
+}
--
Gitblit v1.9.1