新增进货单自定义字段

.idea/workspace.xml

@@ -4,7 +4,7 @@
     <list default="true" id="dfd12a5c-7c33-415d-9f50-070ce9f4f8ce" name="Default" comment="接口测试">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/erp/views.py" afterPath="$PROJECT_DIR$/awj/awj/apps/erp/views.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/utils/if_account.py" afterPath="$PROJECT_DIR$/awj/awj/utils/if_account.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/utils/cust_data.py" afterPath="$PROJECT_DIR$/awj/awj/utils/cust_data.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/logs/hwj.log" afterPath="$PROJECT_DIR$/awj/logs/hwj.log" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -19,7 +19,7 @@
     <SUITE FILE_PATH="coverage/wanjia$lianxi.coverage" NAME="lianxi Coverage Results" MODIFIED="1571323191887" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj/awj/setting" />
     <SUITE FILE_PATH="coverage/wanjia$xixi__1_.coverage" NAME="xixi (1) Coverage Results" MODIFIED="1572786070217" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj/awj/apps/stockinvoice" />
     <SUITE FILE_PATH="coverage/wanjia$a.coverage" NAME="a Coverage Results" MODIFIED="1571234756857" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/wanjia$manage.coverage" NAME="manage Coverage Results" MODIFIED="1575616328441" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj" />
+    <SUITE FILE_PATH="coverage/wanjia$manage.coverage" NAME="manage Coverage Results" MODIFIED="1576586781203" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj" />
     <SUITE FILE_PATH="coverage/wanjia$xixi.coverage" NAME="xixi Coverage Results" MODIFIED="1571566034339" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj/awj/apps" />
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
@@ -29,7 +29,7 @@
         <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/urls.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="162">
-              <caret line="7" column="1" lean-forward="true" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+              <caret line="7" column="1" lean-forward="false" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
               <folding />
             </state>
           </provider>
@@ -38,134 +38,270 @@
       <file leaf-file-name="views.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="334">
-              <caret line="518" column="19" lean-forward="true" selection-start-line="518" selection-start-column="19" selection-end-line="518" selection-end-column="19" />
+            <state relative-caret-position="356">
+              <caret line="273" column="27" lean-forward="false" selection-start-line="273" selection-start-column="27" selection-end-line="273" selection-end-column="27" />
               <folding>
                 <element signature="e#0#35#0" expanded="true" />
                 <element signature="e#557#714#0" expanded="false" />
-                <element signature="e#777#11159#0" expanded="false" />
-                <element signature="e#1499#1500#0" expanded="false" />
-                <element signature="e#3228#3238#0" expanded="false" />
-                <element signature="e#5980#6810#0" expanded="false" />
-                <element signature="e#7187#7967#0" expanded="false" />
-                <element signature="e#8027#9162#0" expanded="false" />
-                <element signature="e#8346#9161#0" expanded="false" />
-                <element signature="e#9489#10193#0" expanded="false" />
-                <element signature="e#10424#10427#0" expanded="false" />
-                <element signature="e#11221#21135#0" expanded="false" />
-                <element signature="e#16507#17069#0" expanded="false" />
-                <element signature="e#17463#17903#0" expanded="false" />
-                <element signature="e#18318#19158#0" expanded="false" />
-                <element signature="e#19459#19929#0" expanded="false" />
-                <element signature="e#20416#20783#0" expanded="false" />
-                <element signature="e#23788#23946#0" expanded="false" />
-                <element signature="e#23798#23832#0" expanded="false" />
-                <element signature="e#24009#34784#0" expanded="false" />
-                <element signature="e#24737#24738#0" expanded="false" />
-                <element signature="e#29805#30754#0" expanded="false" />
-                <element signature="e#31172#31952#0" expanded="false" />
-                <element signature="e#32355#33289#0" expanded="false" />
-                <element signature="e#33621#34291#0" expanded="false" />
-                <element signature="e#34846#44621#0" expanded="false" />
-                <element signature="e#40235#40720#0" expanded="false" />
-                <element signature="e#41071#41455#0" expanded="false" />
-                <element signature="e#41875#42715#0" expanded="false" />
-                <element signature="e#43016#43486#0" expanded="false" />
-                <element signature="e#43990#44269#0" expanded="false" />
-                <element signature="e#44686#47189#0" expanded="false" />
-                <element signature="e#47281#47369#0" expanded="false" />
-                <element signature="e#47432#56878#0" expanded="false" />
-                <element signature="e#48483#48486#0" expanded="false" />
-                <element signature="e#50904#56774#0" expanded="false" />
-                <element signature="e#50949#51100#0" expanded="false" />
-                <element signature="e#52223#53421#0" expanded="false" />
-                <element signature="e#54518#54822#0" expanded="false" />
-                <element signature="e#55170#55902#0" expanded="false" />
-                <element signature="e#56179#56576#0" expanded="false" />
-                <element signature="e#56941#63568#0" expanded="false" />
-                <element signature="e#58082#58085#0" expanded="false" />
-                <element signature="e#63633#65402#0" expanded="false" />
-                <element signature="e#63748#63751#0" expanded="false" />
-                <marker date="1575625588165" expanded="true" signature="4421:4465" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1575625588165" expanded="true" signature="4421:4481" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1575625588165" expanded="true" signature="4783:4845" ph="SELECT ISNUL... PRDT" />
-                <marker date="1575625588165" expanded="true" signature="5710:5940" ph="INSERT INTO MF_PSS... " />
-                <marker date="1575625588165" expanded="true" signature="6915:7147" ph="INSERT INTO MF_ARP... " />
-                <marker date="1575625588165" expanded="true" signature="8074:8248" ph="INSERT INTO MF_PSS... " />
-                <marker date="1575625588165" expanded="true" signature="8074:8306" ph="INSERT INTO MF_PSS... " />
-                <marker date="1575625588165" expanded="true" signature="9248:9453" ph="INSERT INTO TF_PSS... " />
-                <marker date="1575625588165" expanded="true" signature="13951:14008" ph="SELECT ZHANG... MF_PSS" />
-                <marker date="1575625588165" expanded="true" signature="14179:14248" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1575625588165" expanded="true" signature="14517:14586" ph="SELECT ACC_F... MF_PSS" />
-                <marker date="1575625588165" expanded="true" signature="14988:15048" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1575625588165" expanded="true" signature="15350:15412" ph="SELECT ISNUL... " />
-                <marker date="1575625588165" expanded="true" signature="16332:16470" ph="UPDATE MF_PS... " />
-                <marker date="1575625588165" expanded="true" signature="17305:17423" ph="UPDATE MF_AR... " />
-                <marker date="1575625588165" expanded="true" signature="18047:18274" ph="INSERT INTO MF_ARP... " />
-                <marker date="1575625588165" expanded="true" signature="19291:19429" ph="UPDATE MF_PS... " />
-                <marker date="1575625588165" expanded="true" signature="20037:20087" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="20276:20387" ph="UPDATE TF_PS... " />
-                <marker date="1575625588165" expanded="true" signature="21931:21988" ph="SELECT ZHANG... MF_PSS" />
-                <marker date="1575625588165" expanded="true" signature="22208:22277" ph="SELECT ISNUL... MF_ARP" />
-                <marker date="1575625588165" expanded="true" signature="22592:22661" ph="SELECT ISNUL... MF_PSS" />
-                <marker date="1575625588165" expanded="true" signature="23061:23110" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="23170:23219" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="23279:23330" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="28197:28257" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1575625588165" expanded="true" signature="28559:28621" ph="SELECT ISNUL... " />
-                <marker date="1575625588165" expanded="true" signature="29512:29765" ph="INSERT INTO MF_PSS... " />
-                <marker date="1575625588165" expanded="true" signature="30896:31132" ph="INSERT INTO MF_ARP... " />
-                <marker date="1575625588165" expanded="true" signature="32060:32315" ph="INSERT INTO MF_PSS... " />
-                <marker date="1575625588165" expanded="true" signature="33376:33585" ph="INSERT INTO TF_PSS... " />
-                <marker date="1575625588165" expanded="true" signature="37475:37532" ph="SELECT ZHANG... MF_PSS" />
-                <marker date="1575625588165" expanded="true" signature="37793:37862" ph="SELECT ISNUL... MF_ARP" />
-                <marker date="1575625588165" expanded="true" signature="38177:38246" ph="SELECT ISNUL... MF_PSS" />
-                <marker date="1575625588165" expanded="true" signature="38698:38758" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1575625588165" expanded="true" signature="39060:39122" ph="SELECT ISNUL... " />
-                <marker date="1575625588165" expanded="true" signature="40067:40205" ph="UPDATE MF_PS... " />
-                <marker date="1575625588165" expanded="true" signature="40920:41038" ph="UPDATE MF_AR... " />
-                <marker date="1575625588165" expanded="true" signature="41600:41831" ph="INSERT INTO MF_ARP... " />
-                <marker date="1575625588165" expanded="true" signature="42848:42986" ph="UPDATE MF_PS... " />
-                <marker date="1575625588165" expanded="true" signature="43594:43644" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="43854:43965" ph="UPDATE TF_PS... " />
-                <marker date="1575625588165" expanded="true" signature="45421:45478" ph="SELECT ZHANG... MF_PSS" />
-                <marker date="1575625588165" expanded="true" signature="45698:45767" ph="SELECT ISNUL... MF_ARP" />
-                <marker date="1575625588165" expanded="true" signature="46082:46151" ph="SELECT ISNUL... MF_PSS" />
-                <marker date="1575625588165" expanded="true" signature="46551:46600" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="46660:46709" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="46769:46820" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="51011:51071" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1575625588165" expanded="true" signature="51387:51438" ph="SELECT ISNUL... BACC" />
-                <marker date="1575625588165" expanded="true" signature="51889:52179" ph="INSERT INTO TF_MON... " />
-                <marker date="1575625588165" expanded="true" signature="51889:52183" ph="INSERT INTO TF_MON... " />
-                <marker date="1575625588165" expanded="true" signature="53655:53935" ph="INSERT INTO TF_MON... " />
-                <marker date="1575625588165" expanded="true" signature="54347:54482" ph="INSERT INTO MF_MON... " />
-                <marker date="1575625588165" expanded="true" signature="54911:55134" ph="INSERT INTO MF_BAC... " />
-                <marker date="1575625588165" expanded="true" signature="55989:56143" ph="INSERT INTO TF_BAC... " />
-                <marker date="1575625588165" expanded="true" signature="60619:60679" ph="SELECT COUNT... MF_VHID" />
-                <marker date="1575625588165" expanded="true" signature="61020:61071" ph="SELECT ISNUL... BACC" />
-                <marker date="1575625588165" expanded="true" signature="61547:61700" ph="UPDATE TF_MO... " />
-                <marker date="1575625588165" expanded="true" signature="62069:62223" ph="UPDATE TF_MO... " />
-                <marker date="1575625588165" expanded="true" signature="62488:62537" ph="UPDATE MF_MO... " />
-                <marker date="1575625588165" expanded="true" signature="62725:62812" ph="UPDATE MF_BA... " />
-                <marker date="1575625588165" expanded="true" signature="63089:63148" ph="UPDATE TF_BA... " />
-                <marker date="1575625588165" expanded="true" signature="64675:64722" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="64796:64844" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="64920:64953" ph="DELETE FROM " />
-                <marker date="1575625588165" expanded="true" signature="65041:65074" ph="DELETE FROM " />
+                <element signature="e#777#11399#0" expanded="false" />
+                <element signature="e#1545#1546#0" expanded="false" />
+                <element signature="e#3274#3284#0" expanded="false" />
+                <element signature="e#6026#6856#0" expanded="false" />
+                <element signature="e#7426#8206#0" expanded="false" />
+                <element signature="e#8266#9401#0" expanded="false" />
+                <element signature="e#8585#9400#0" expanded="false" />
+                <element signature="e#9728#10432#0" expanded="false" />
+                <element signature="e#10663#10666#0" expanded="false" />
+                <element signature="e#11461#22232#0" expanded="false" />
+                <element signature="e#12126#12129#0" expanded="false" />
+                <element signature="e#17603#18165#0" expanded="false" />
+                <element signature="e#18559#18999#0" expanded="false" />
+                <element signature="e#19415#20255#0" expanded="false" />
+                <element signature="e#20556#21026#0" expanded="false" />
+                <element signature="e#21513#21880#0" expanded="false" />
+                <element signature="e#22297#24918#0" expanded="false" />
+                <element signature="e#25007#25165#0" expanded="false" />
+                <element signature="e#25017#25051#0" expanded="false" />
+                <element signature="e#25228#36085#0" expanded="false" />
+                <element signature="e#25956#25957#0" expanded="false" />
+                <element signature="e#31106#32055#0" expanded="false" />
+                <element signature="e#32473#33253#0" expanded="false" />
+                <element signature="e#33656#34590#0" expanded="false" />
+                <element signature="e#34922#35592#0" expanded="false" />
+                <element signature="e#36147#46475#0" expanded="false" />
+                <element signature="e#42089#42574#0" expanded="false" />
+                <element signature="e#42925#43309#0" expanded="false" />
+                <element signature="e#43729#44569#0" expanded="false" />
+                <element signature="e#44870#45340#0" expanded="false" />
+                <element signature="e#45844#46123#0" expanded="false" />
+                <element signature="e#46540#49042#0" expanded="false" />
+                <element signature="e#49134#49222#0" expanded="false" />
+                <element signature="e#49285#58880#0" expanded="false" />
+                <element signature="e#50336#50339#0" expanded="false" />
+                <element signature="e#52923#53074#0" expanded="false" />
+                <element signature="e#54197#55395#0" expanded="false" />
+                <element signature="e#56492#56796#0" expanded="false" />
+                <element signature="e#57144#57876#0" expanded="false" />
+                <element signature="e#58153#58550#0" expanded="false" />
+                <element signature="e#58943#65764#0" expanded="false" />
+                <element signature="e#60084#60087#0" expanded="false" />
+                <element signature="e#65829#67622#0" expanded="false" />
+                <element signature="e#65944#65947#0" expanded="false" />
+                <marker date="1576586745670" expanded="true" signature="4467:4511" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1576586745670" expanded="true" signature="4467:4527" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1576586745670" expanded="true" signature="4829:4891" ph="SELECT ISNUL... PRDT" />
+                <marker date="1576586745670" expanded="true" signature="5756:5986" ph="INSERT INTO MF_PSS... " />
+                <marker date="1576586745670" expanded="true" signature="6964:7017" ph="INSERT INTO MF_PSS_Z... " />
+                <marker date="1576586745670" expanded="true" signature="6964:7151" ph="INSERT INTO MF_PSS_Z... " />
+                <marker date="1576586745670" expanded="true" signature="7154:7386" ph="INSERT INTO MF_ARP... " />
+                <marker date="1576586745670" expanded="true" signature="8313:8487" ph="INSERT INTO MF_PSS... " />
+                <marker date="1576586745670" expanded="true" signature="8313:8545" ph="INSERT INTO MF_PSS... " />
+                <marker date="1576586745670" expanded="true" signature="9487:9692" ph="INSERT INTO TF_PSS... " />
+                <marker date="1576586745670" expanded="true" signature="14710:14767" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1576586745670" expanded="true" signature="14938:15007" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1576586745670" expanded="true" signature="15276:15345" ph="SELECT ACC_F... MF_PSS" />
+                <marker date="1576586745670" expanded="true" signature="15747:15807" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1576586745670" expanded="true" signature="16109:16171" ph="SELECT ISNUL... " />
+                <marker date="1576586745670" expanded="true" signature="17081:17138" ph="UPDATE MF_PS... " />
+                <marker date="1576586745670" expanded="true" signature="17236:17293" ph="UPDATE MF_PS... " />
+                <marker date="1576586745670" expanded="true" signature="17428:17566" ph="UPDATE MF_PS... " />
+                <marker date="1576586745670" expanded="true" signature="18401:18519" ph="UPDATE MF_AR... " />
+                <marker date="1576586745670" expanded="true" signature="19144:19371" ph="INSERT INTO MF_ARP... " />
+                <marker date="1576586745670" expanded="true" signature="20388:20526" ph="UPDATE MF_PS... " />
+                <marker date="1576586745670" expanded="true" signature="21134:21184" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="21373:21484" ph="UPDATE TF_PS... " />
+                <marker date="1576586745670" expanded="true" signature="23150:23207" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1576586745670" expanded="true" signature="23427:23496" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1576586745670" expanded="true" signature="23811:23880" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1576586745670" expanded="true" signature="24280:24329" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="24389:24438" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="24498:24549" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="29498:29558" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1576586745670" expanded="true" signature="29860:29922" ph="SELECT ISNUL... " />
+                <marker date="1576586745670" expanded="true" signature="30813:31066" ph="INSERT INTO MF_PSS... " />
+                <marker date="1576586745670" expanded="true" signature="32197:32433" ph="INSERT INTO MF_ARP... " />
+                <marker date="1576586745670" expanded="true" signature="33361:33616" ph="INSERT INTO MF_PSS... " />
+                <marker date="1576586745670" expanded="true" signature="34677:34886" ph="INSERT INTO TF_PSS... " />
+                <marker date="1576586745670" expanded="true" signature="39329:39386" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1576586745670" expanded="true" signature="39647:39716" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1576586745670" expanded="true" signature="40031:40100" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1576586745670" expanded="true" signature="40552:40612" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1576586745670" expanded="true" signature="40914:40976" ph="SELECT ISNUL... " />
+                <marker date="1576586745670" expanded="true" signature="41921:42059" ph="UPDATE MF_PS... " />
+                <marker date="1576586745670" expanded="true" signature="42774:42892" ph="UPDATE MF_AR... " />
+                <marker date="1576586745670" expanded="true" signature="43454:43685" ph="INSERT INTO MF_ARP... " />
+                <marker date="1576586745670" expanded="true" signature="44702:44840" ph="UPDATE MF_PS... " />
+                <marker date="1576586745670" expanded="true" signature="45448:45498" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="45708:45819" ph="UPDATE TF_PS... " />
+                <marker date="1576586745670" expanded="true" signature="47274:47331" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1576586745670" expanded="true" signature="47551:47620" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1576586745670" expanded="true" signature="47935:48004" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1576586745670" expanded="true" signature="48404:48453" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="48513:48562" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="48622:48673" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="52985:53045" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1576586745670" expanded="true" signature="53361:53412" ph="SELECT ISNUL... BACC" />
+                <marker date="1576586745670" expanded="true" signature="53863:54153" ph="INSERT INTO TF_MON... " />
+                <marker date="1576586745670" expanded="true" signature="53863:54157" ph="INSERT INTO TF_MON... " />
+                <marker date="1576586745670" expanded="true" signature="55629:55909" ph="INSERT INTO TF_MON... " />
+                <marker date="1576586745670" expanded="true" signature="56321:56456" ph="INSERT INTO MF_MON... " />
+                <marker date="1576586745670" expanded="true" signature="56885:57108" ph="INSERT INTO MF_BAC... " />
+                <marker date="1576586745670" expanded="true" signature="57963:58117" ph="INSERT INTO TF_BAC... " />
+                <marker date="1576586745670" expanded="true" signature="62786:62846" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1576586745670" expanded="true" signature="63187:63238" ph="SELECT ISNUL... BACC" />
+                <marker date="1576586745670" expanded="true" signature="63714:63867" ph="UPDATE TF_MO... " />
+                <marker date="1576586745670" expanded="true" signature="64236:64390" ph="UPDATE TF_MO... " />
+                <marker date="1576586745670" expanded="true" signature="64655:64704" ph="UPDATE MF_MO... " />
+                <marker date="1576586745670" expanded="true" signature="64892:64979" ph="UPDATE MF_BA... " />
+                <marker date="1576586745670" expanded="true" signature="65256:65315" ph="UPDATE TF_BA... " />
+                <marker date="1576586745670" expanded="true" signature="66869:66916" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="66990:67038" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="67114:67147" ph="DELETE FROM " />
+                <marker date="1576586745670" expanded="true" signature="67235:67268" ph="DELETE FROM " />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="cust_data.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/awj/awj/utils/cust_data.py">
+      <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/awj/awj/apps/salesinvoice/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="54">
-              <caret line="2" column="4" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
+            <state relative-caret-position="162">
+              <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
               <folding>
-                <marker date="1575535454489" expanded="true" signature="320:361" ph="SELECT COUNT... CUST" />
-                <marker date="1575535454489" expanded="true" signature="462:903" ph="INSERT INTO CUST... " />
+                <element signature="e#495#659#0" expanded="false" />
+                <element signature="e#722#7191#0" expanded="false" />
+                <element signature="e#7254#13455#0" expanded="false" />
+                <element signature="e#13520#16359#0" expanded="false" />
+                <element signature="e#16399#30934#0" expanded="false" />
+                <element signature="e#16610#22807#0" expanded="false" />
+                <element signature="e#22870#28058#0" expanded="false" />
+                <element signature="e#28123#30932#0" expanded="false" />
+                <element signature="e#30977#43455#0" expanded="false" />
+                <element signature="e#31033#31147#0" expanded="false" />
+                <element signature="e#31210#36972#0" expanded="false" />
+                <element signature="e#37035#41726#0" expanded="false" />
+                <element signature="e#41791#43453#0" expanded="false" />
+                <element signature="e#43498#59965#0" expanded="false" />
+                <element signature="e#43554#43912#0" expanded="false" />
+                <element signature="e#43975#50267#0" expanded="false" />
+                <element signature="e#44423#44426#0" expanded="false" />
+                <element signature="e#50329#56506#0" expanded="false" />
+                <element signature="e#56571#59965#0" expanded="false" />
+                <marker date="1575351976885" expanded="true" signature="3868:4067" ph="INSERT INTO MF_PSS... " />
+                <marker date="1575351976885" expanded="true" signature="4361:4553" ph="INSERT INTO TF_PSS... " />
+                <marker date="1575351976885" expanded="true" signature="4702:4947" ph="INSERT INTO INV_NO... " />
+                <marker date="1575351976885" expanded="true" signature="5199:5398" ph="INSERT INTO MF_ARP... " />
+                <marker date="1575351976885" expanded="true" signature="5683:5953" ph="INSERT INTO MF_LZ... " />
+                <marker date="1575351976885" expanded="true" signature="6317:6536" ph="INSERT INTO TF_LZ... " />
+                <marker date="1575351976885" expanded="true" signature="6700:6811" ph="UPDATE TF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="11057:11170" ph="UPDATE MF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="11354:11472" ph="UPDATE TF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="11687:11872" ph="UPDATE INV_N... " />
+                <marker date="1575351976885" expanded="true" signature="12096:12214" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="12457:12589" ph="UPDATE MF_LZ... " />
+                <marker date="1575351976885" expanded="true" signature="12822:12897" ph="UPDATE TF_LZ... " />
+                <marker date="1575351976885" expanded="true" signature="13006:13078" ph="UPDATE TF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="14864:14901" ph="SELECT COUNT... missing_value" />
+                <marker date="1575351976885" expanded="true" signature="15264:15312" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="15397:15445" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="15528:15578" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="15659:15710" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="15794:15842" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="15938:15986" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="18620:18663" ph="SELECT COUNT... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="18865:18916" ph="SELECT ISNUL... BACC" />
+                <marker date="1575351976885" expanded="true" signature="19243:19507" ph="INSERT INTO TF_MON... " />
+                <marker date="1575351976885" expanded="true" signature="19875:20140" ph="INSERT INTO TF_MON... " />
+                <marker date="1575351976885" expanded="true" signature="20436:20573" ph="INSERT INTO TC_MON... " />
+                <marker date="1575351976885" expanded="true" signature="20733:20855" ph="INSERT INTO MF_MON... " />
+                <marker date="1575351976885" expanded="true" signature="21004:21215" ph="INSERT INTO MF_BAC... " />
+                <marker date="1575351976885" expanded="true" signature="21527:21665" ph="INSERT INTO TF_BAC... " />
+                <marker date="1575351976885" expanded="true" signature="21816:21921" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="22180:22228" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="22328:22374" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="22427:22483" ph="UPDATE MF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="24714:24757" ph="SELECT COUNT... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="24962:25002" ph="SELECT Acc_N... BACC" />
+                <marker date="1575351976885" expanded="true" signature="25206:25261" ph="SELECT AMTN_... TF_MON" />
+                <marker date="1575351976885" expanded="true" signature="25516:25633" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="25868:25985" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="26124:26191" ph="UPDATE TC_MO... " />
+                <marker date="1575351976885" expanded="true" signature="26281:26364" ph="UPDATE MF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="26524:26609" ph="UPDATE MF_BA... " />
+                <marker date="1575351976885" expanded="true" signature="26812:26876" ph="UPDATE TF_BA... " />
+                <marker date="1575351976885" expanded="true" signature="27072:27179" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="27334:27419" ph="SELECT CAST(... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="27550:27612" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="27665:27736" ph="UPDATE MF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="28622:28688" ph="SELECT ISNUL... TF_MON" />
+                <marker date="1575351976885" expanded="true" signature="28779:28833" ph="SELECT ARP_N... TC_MON" />
+                <marker date="1575351976885" expanded="true" signature="28975:29030" ph="SELECT AMTN_... TF_MON" />
+                <marker date="1575351976885" expanded="true" signature="29188:29236" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="29310:29358" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="29432:29479" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="29555:29604" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="29692:29741" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="29861:29900" ph="SELECT AMTN MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="30056:30106" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="30258:30360" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="30455:30501" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="30550:30606" ph="UPDATE MF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="33657:33708" ph="SELECT ISNUL... BACC" />
+                <marker date="1575351976885" expanded="true" signature="34061:34338" ph="INSERT INTO TF_MON... " />
+                <marker date="1575351976885" expanded="true" signature="34785:35064" ph="INSERT INTO TF_MON... " />
+                <marker date="1575351976885" expanded="true" signature="35442:35588" ph="INSERT INTO MF_MON... " />
+                <marker date="1575351976885" expanded="true" signature="35751:35978" ph="INSERT INTO MF_BAC... " />
+                <marker date="1575351976885" expanded="true" signature="36399:36551" ph="INSERT INTO TF_BAC... " />
+                <marker date="1575351976885" expanded="true" signature="39693:39733" ph="SELECT Acc_N... BACC" />
+                <marker date="1575351976885" expanded="true" signature="40056:40166" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="40455:40565" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="40787:40836" ph="UPDATE MF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="40968:41048" ph="UPDATE MF_BA... " />
+                <marker date="1575351976885" expanded="true" signature="41247:41306" ph="UPDATE TF_BA... " />
+                <marker date="1575351976885" expanded="true" signature="42726:42773" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="42847:42895" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="42971:43004" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="43092:43125" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="46586:46625" ph="SELECT AMTN MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="47011:47144" ph="INSERT INTO TF_MON1... " />
+                <marker date="1575351976885" expanded="true" signature="47235:47476" ph="INSERT INTO TF_MON... " />
+                <marker date="1575351976885" expanded="true" signature="47948:48091" ph="INSERT INTO TC_MON... " />
+                <marker date="1575351976885" expanded="true" signature="48300:48405" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="48561:48630" ph="SELECT CAST(... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="48785:48831" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="48889:48960" ph="UPDATE MF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="49104:49208" ph="INSERT INTO MF_MON... " />
+                <marker date="1575351976885" expanded="true" signature="49390:49467" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="49639:49748" ph="SELECT ISNUL... TF_MON" />
+                <marker date="1575351976885" expanded="true" signature="49892:49950" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="52808:52847" ph="SELECT AMTN MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="53167:53227" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="53331:53438" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="53780:53833" ph="SELECT ISNUL... TC_MON" />
+                <marker date="1575351976885" expanded="true" signature="54061:54120" ph="UPDATE TC_MO... " />
+                <marker date="1575351976885" expanded="true" signature="54474:54542" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="54743:54854" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="55025:55094" ph="SELECT CAST(... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="55203:55249" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="55307:55378" ph="UPDATE MF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="55468:55527" ph="UPDATE MF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="55634:55714" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="55877:55986" ph="SELECT ISNUL... TF_MON" />
+                <marker date="1575351976885" expanded="true" signature="56131:56189" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="57379:57445" ph="SELECT ISNUL... TF_MON" />
+                <marker date="1575351976885" expanded="true" signature="57548:57603" ph="SELECT IRP_N... TF_MON1" />
+                <marker date="1575351976885" expanded="true" signature="57696:57773" ph="UPDATE TF_MO... " />
+                <marker date="1575351976885" expanded="true" signature="57886:57940" ph="SELECT ARP_N... TC_MON" />
+                <marker date="1575351976885" expanded="true" signature="58327:58395" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="58593:58698" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="58821:58890" ph="SELECT CAST(... MF_ARP" />
+                <marker date="1575351976885" expanded="true" signature="58996:59042" ph="UPDATE MF_AR... " />
+                <marker date="1575351976885" expanded="true" signature="59097:59153" ph="UPDATE MF_PS... " />
+                <marker date="1575351976885" expanded="true" signature="59236:59284" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="59358:59405" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="59479:59527" ph="DELETE FROM " />
+                <marker date="1575351976885" expanded="true" signature="59600:59647" ph="DELETE FROM " />
               </folding>
             </state>
           </provider>
@@ -174,8 +310,8 @@
       <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="539">
-              <caret line="204" column="8" lean-forward="true" selection-start-line="204" selection-start-column="8" selection-end-line="204" selection-end-column="69" />
+            <state relative-caret-position="803">
+              <caret line="204" column="8" lean-forward="false" selection-start-line="204" selection-start-column="8" selection-end-line="204" selection-end-column="69" />
               <folding>
                 <element signature="e#0#11#0" expanded="true" />
                 <element signature="e#424#781#0" expanded="false" />
@@ -257,6 +393,7 @@
       <find>AMT</find>
       <find>customer_data</find>
       <find>TAX_RTO</find>
+      <find>CNT_MAN2</find>
     </findStrings>
     <replaceStrings>
       <replace>安装费用</replace>
@@ -300,8 +437,8 @@
         <option value="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/views.py" />
         <option value="$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py" />
         <option value="$PROJECT_DIR$/awj/awj/utils/usr_data.py" />
-        <option value="$PROJECT_DIR$/awj/awj/utils/cust_data.py" />
         <option value="$PROJECT_DIR$/awj/awj/utils/if_account.py" />
+        <option value="$PROJECT_DIR$/awj/awj/utils/cust_data.py" />
         <option value="$PROJECT_DIR$/awj/awj/apps/erp/views.py" />
       </list>
     </option>
@@ -313,8 +450,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="164" />
-    <option name="y" value="69" />
+    <option name="x" value="3" />
+    <option name="y" value="5" />
     <option name="width" value="1936" />
     <option name="height" value="1056" />
   </component>
@@ -377,6 +514,28 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="wanjia" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="wanjia" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="awj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="awj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="utils" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="wanjia" />
@@ -849,17 +1008,16 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="164" y="69" width="1936" height="1056" extended-state="1" />
-    <editor active="true" />
+    <frame x="3" y="5" width="1936" height="1056" extended-state="0" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329718" sideWeight="0.5021322" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24186552" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2383532" sideWeight="0.4978678" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39154014" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23752712" sideWeight="0.4978678" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.07782516" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15191898" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -1151,16 +1309,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="505">
           <caret line="253" column="8" lean-forward="false" selection-start-line="253" selection-start-column="8" selection-end-line="256" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#35#0" expanded="false" />
-            <element signature="e#5935#6765#0" expanded="false" />
-            <marker date="1575454306800" expanded="true" signature="4382:4442" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575454306800" expanded="true" signature="4747:4802" ph="SELECT ISNUL... PRDT" />
-            <marker date="1575454306800" expanded="true" signature="5665:5895" ph="INSERT INTO MF_PSS... " />
-            <marker date="1575454306800" expanded="true" signature="6899:7112" ph="INSERT INTO MF_ARP... " />
-            <marker date="1575454306800" expanded="true" signature="7916:8148" ph="INSERT INTO MF_PSS... " />
-            <marker date="1575454306800" expanded="true" signature="9090:9272" ph="INSERT INTO TF_PSS... " />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1175,49 +1323,64 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils/cust_data.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/utils/if_account.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="2" column="4" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
+        <state relative-caret-position="297">
+          <caret line="12" column="67" lean-forward="true" selection-start-line="12" selection-start-column="67" selection-end-line="12" selection-end-column="67" />
           <folding>
-            <marker date="1575535454489" expanded="true" signature="320:361" ph="SELECT COUNT... CUST" />
-            <marker date="1575535454489" expanded="true" signature="462:903" ph="INSERT INTO CUST... " />
+            <marker date="1575599365410" expanded="true" signature="184:225" ph="SELECT Bacc_... BACC" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="7" column="1" lean-forward="false" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/awj/awj/utils/et_CACC_NO.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="5" column="4" lean-forward="false" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
+        <state relative-caret-position="351">
+          <caret line="14" column="18" lean-forward="true" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
           <folding>
             <marker date="1573709145461" expanded="true" signature="184:224" ph="SELECT COUNT... BACC" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils/if_account.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/utils/cust_data.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="12" column="67" lean-forward="true" selection-start-line="12" selection-start-column="67" selection-end-line="12" selection-end-column="67" />
+        <state relative-caret-position="540">
+          <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
           <folding>
-            <marker date="1575599365410" expanded="true" signature="184:225" ph="SELECT Bacc_... BACC" />
+            <marker date="1576475625813" expanded="true" signature="320:361" ph="SELECT COUNT... CUST" />
+            <marker date="1576475625813" expanded="true" signature="462:918" ph="INSERT INTO CUST... " />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/awj/awj/apps/salesinvoice/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="662" column="81" lean-forward="false" selection-start-line="660" selection-start-column="36" selection-end-line="662" selection-end-column="81" />
+        <state relative-caret-position="162">
+          <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
           <folding>
-            <element signature="e#439#16361#0" expanded="false" />
+            <element signature="e#495#659#0" expanded="false" />
+            <element signature="e#722#7191#0" expanded="false" />
+            <element signature="e#7254#13455#0" expanded="false" />
+            <element signature="e#13520#16359#0" expanded="false" />
+            <element signature="e#16399#30934#0" expanded="false" />
             <element signature="e#16610#22807#0" expanded="false" />
             <element signature="e#22870#28058#0" expanded="false" />
             <element signature="e#28123#30932#0" expanded="false" />
+            <element signature="e#30977#43455#0" expanded="false" />
             <element signature="e#31033#31147#0" expanded="false" />
+            <element signature="e#31210#36972#0" expanded="false" />
             <element signature="e#37035#41726#0" expanded="false" />
             <element signature="e#41791#43453#0" expanded="false" />
+            <element signature="e#43498#59965#0" expanded="false" />
             <element signature="e#43554#43912#0" expanded="false" />
             <element signature="e#43975#50267#0" expanded="false" />
             <element signature="e#44423#44426#0" expanded="false" />
@@ -1343,8 +1506,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="539">
-          <caret line="204" column="8" lean-forward="true" selection-start-line="204" selection-start-column="8" selection-end-line="204" selection-end-column="69" />
+        <state relative-caret-position="803">
+          <caret line="204" column="8" lean-forward="false" selection-start-line="204" selection-start-column="8" selection-end-line="204" selection-end-column="69" />
           <folding>
             <element signature="e#0#11#0" expanded="true" />
             <element signature="e#424#781#0" expanded="false" />
@@ -1386,131 +1549,128 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="7" column="1" lean-forward="true" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="334">
-          <caret line="518" column="19" lean-forward="true" selection-start-line="518" selection-start-column="19" selection-end-line="518" selection-end-column="19" />
+        <state relative-caret-position="356">
+          <caret line="273" column="27" lean-forward="false" selection-start-line="273" selection-start-column="27" selection-end-line="273" selection-end-column="27" />
           <folding>
             <element signature="e#0#35#0" expanded="true" />
             <element signature="e#557#714#0" expanded="false" />
-            <element signature="e#777#11159#0" expanded="false" />
-            <element signature="e#1499#1500#0" expanded="false" />
-            <element signature="e#3228#3238#0" expanded="false" />
-            <element signature="e#5980#6810#0" expanded="false" />
-            <element signature="e#7187#7967#0" expanded="false" />
-            <element signature="e#8027#9162#0" expanded="false" />
-            <element signature="e#8346#9161#0" expanded="false" />
-            <element signature="e#9489#10193#0" expanded="false" />
-            <element signature="e#10424#10427#0" expanded="false" />
-            <element signature="e#11221#21135#0" expanded="false" />
-            <element signature="e#16507#17069#0" expanded="false" />
-            <element signature="e#17463#17903#0" expanded="false" />
-            <element signature="e#18318#19158#0" expanded="false" />
-            <element signature="e#19459#19929#0" expanded="false" />
-            <element signature="e#20416#20783#0" expanded="false" />
-            <element signature="e#23788#23946#0" expanded="false" />
-            <element signature="e#23798#23832#0" expanded="false" />
-            <element signature="e#24009#34784#0" expanded="false" />
-            <element signature="e#24737#24738#0" expanded="false" />
-            <element signature="e#29805#30754#0" expanded="false" />
-            <element signature="e#31172#31952#0" expanded="false" />
-            <element signature="e#32355#33289#0" expanded="false" />
-            <element signature="e#33621#34291#0" expanded="false" />
-            <element signature="e#34846#44621#0" expanded="false" />
-            <element signature="e#40235#40720#0" expanded="false" />
-            <element signature="e#41071#41455#0" expanded="false" />
-            <element signature="e#41875#42715#0" expanded="false" />
-            <element signature="e#43016#43486#0" expanded="false" />
-            <element signature="e#43990#44269#0" expanded="false" />
-            <element signature="e#44686#47189#0" expanded="false" />
-            <element signature="e#47281#47369#0" expanded="false" />
-            <element signature="e#47432#56878#0" expanded="false" />
-            <element signature="e#48483#48486#0" expanded="false" />
-            <element signature="e#50904#56774#0" expanded="false" />
-            <element signature="e#50949#51100#0" expanded="false" />
-            <element signature="e#52223#53421#0" expanded="false" />
-            <element signature="e#54518#54822#0" expanded="false" />
-            <element signature="e#55170#55902#0" expanded="false" />
-            <element signature="e#56179#56576#0" expanded="false" />
-            <element signature="e#56941#63568#0" expanded="false" />
-            <element signature="e#58082#58085#0" expanded="false" />
-            <element signature="e#63633#65402#0" expanded="false" />
-            <element signature="e#63748#63751#0" expanded="false" />
-            <marker date="1575625588165" expanded="true" signature="4421:4465" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575625588165" expanded="true" signature="4421:4481" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575625588165" expanded="true" signature="4783:4845" ph="SELECT ISNUL... PRDT" />
-            <marker date="1575625588165" expanded="true" signature="5710:5940" ph="INSERT INTO MF_PSS... " />
-            <marker date="1575625588165" expanded="true" signature="6915:7147" ph="INSERT INTO MF_ARP... " />
-            <marker date="1575625588165" expanded="true" signature="8074:8248" ph="INSERT INTO MF_PSS... " />
-            <marker date="1575625588165" expanded="true" signature="8074:8306" ph="INSERT INTO MF_PSS... " />
-            <marker date="1575625588165" expanded="true" signature="9248:9453" ph="INSERT INTO TF_PSS... " />
-            <marker date="1575625588165" expanded="true" signature="13951:14008" ph="SELECT ZHANG... MF_PSS" />
-            <marker date="1575625588165" expanded="true" signature="14179:14248" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575625588165" expanded="true" signature="14517:14586" ph="SELECT ACC_F... MF_PSS" />
-            <marker date="1575625588165" expanded="true" signature="14988:15048" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575625588165" expanded="true" signature="15350:15412" ph="SELECT ISNUL... " />
-            <marker date="1575625588165" expanded="true" signature="16332:16470" ph="UPDATE MF_PS... " />
-            <marker date="1575625588165" expanded="true" signature="17305:17423" ph="UPDATE MF_AR... " />
-            <marker date="1575625588165" expanded="true" signature="18047:18274" ph="INSERT INTO MF_ARP... " />
-            <marker date="1575625588165" expanded="true" signature="19291:19429" ph="UPDATE MF_PS... " />
-            <marker date="1575625588165" expanded="true" signature="20037:20087" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="20276:20387" ph="UPDATE TF_PS... " />
-            <marker date="1575625588165" expanded="true" signature="21931:21988" ph="SELECT ZHANG... MF_PSS" />
-            <marker date="1575625588165" expanded="true" signature="22208:22277" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1575625588165" expanded="true" signature="22592:22661" ph="SELECT ISNUL... MF_PSS" />
-            <marker date="1575625588165" expanded="true" signature="23061:23110" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="23170:23219" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="23279:23330" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="28197:28257" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575625588165" expanded="true" signature="28559:28621" ph="SELECT ISNUL... " />
-            <marker date="1575625588165" expanded="true" signature="29512:29765" ph="INSERT INTO MF_PSS... " />
-            <marker date="1575625588165" expanded="true" signature="30896:31132" ph="INSERT INTO MF_ARP... " />
-            <marker date="1575625588165" expanded="true" signature="32060:32315" ph="INSERT INTO MF_PSS... " />
-            <marker date="1575625588165" expanded="true" signature="33376:33585" ph="INSERT INTO TF_PSS... " />
-            <marker date="1575625588165" expanded="true" signature="37475:37532" ph="SELECT ZHANG... MF_PSS" />
-            <marker date="1575625588165" expanded="true" signature="37793:37862" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1575625588165" expanded="true" signature="38177:38246" ph="SELECT ISNUL... MF_PSS" />
-            <marker date="1575625588165" expanded="true" signature="38698:38758" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575625588165" expanded="true" signature="39060:39122" ph="SELECT ISNUL... " />
-            <marker date="1575625588165" expanded="true" signature="40067:40205" ph="UPDATE MF_PS... " />
-            <marker date="1575625588165" expanded="true" signature="40920:41038" ph="UPDATE MF_AR... " />
-            <marker date="1575625588165" expanded="true" signature="41600:41831" ph="INSERT INTO MF_ARP... " />
-            <marker date="1575625588165" expanded="true" signature="42848:42986" ph="UPDATE MF_PS... " />
-            <marker date="1575625588165" expanded="true" signature="43594:43644" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="43854:43965" ph="UPDATE TF_PS... " />
-            <marker date="1575625588165" expanded="true" signature="45421:45478" ph="SELECT ZHANG... MF_PSS" />
-            <marker date="1575625588165" expanded="true" signature="45698:45767" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1575625588165" expanded="true" signature="46082:46151" ph="SELECT ISNUL... MF_PSS" />
-            <marker date="1575625588165" expanded="true" signature="46551:46600" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="46660:46709" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="46769:46820" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="51011:51071" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575625588165" expanded="true" signature="51387:51438" ph="SELECT ISNUL... BACC" />
-            <marker date="1575625588165" expanded="true" signature="51889:52179" ph="INSERT INTO TF_MON... " />
-            <marker date="1575625588165" expanded="true" signature="51889:52183" ph="INSERT INTO TF_MON... " />
-            <marker date="1575625588165" expanded="true" signature="53655:53935" ph="INSERT INTO TF_MON... " />
-            <marker date="1575625588165" expanded="true" signature="54347:54482" ph="INSERT INTO MF_MON... " />
-            <marker date="1575625588165" expanded="true" signature="54911:55134" ph="INSERT INTO MF_BAC... " />
-            <marker date="1575625588165" expanded="true" signature="55989:56143" ph="INSERT INTO TF_BAC... " />
-            <marker date="1575625588165" expanded="true" signature="60619:60679" ph="SELECT COUNT... MF_VHID" />
-            <marker date="1575625588165" expanded="true" signature="61020:61071" ph="SELECT ISNUL... BACC" />
-            <marker date="1575625588165" expanded="true" signature="61547:61700" ph="UPDATE TF_MO... " />
-            <marker date="1575625588165" expanded="true" signature="62069:62223" ph="UPDATE TF_MO... " />
-            <marker date="1575625588165" expanded="true" signature="62488:62537" ph="UPDATE MF_MO... " />
-            <marker date="1575625588165" expanded="true" signature="62725:62812" ph="UPDATE MF_BA... " />
-            <marker date="1575625588165" expanded="true" signature="63089:63148" ph="UPDATE TF_BA... " />
-            <marker date="1575625588165" expanded="true" signature="64675:64722" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="64796:64844" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="64920:64953" ph="DELETE FROM " />
-            <marker date="1575625588165" expanded="true" signature="65041:65074" ph="DELETE FROM " />
+            <element signature="e#777#11399#0" expanded="false" />
+            <element signature="e#1545#1546#0" expanded="false" />
+            <element signature="e#3274#3284#0" expanded="false" />
+            <element signature="e#6026#6856#0" expanded="false" />
+            <element signature="e#7426#8206#0" expanded="false" />
+            <element signature="e#8266#9401#0" expanded="false" />
+            <element signature="e#8585#9400#0" expanded="false" />
+            <element signature="e#9728#10432#0" expanded="false" />
+            <element signature="e#10663#10666#0" expanded="false" />
+            <element signature="e#11461#22232#0" expanded="false" />
+            <element signature="e#12126#12129#0" expanded="false" />
+            <element signature="e#17603#18165#0" expanded="false" />
+            <element signature="e#18559#18999#0" expanded="false" />
+            <element signature="e#19415#20255#0" expanded="false" />
+            <element signature="e#20556#21026#0" expanded="false" />
+            <element signature="e#21513#21880#0" expanded="false" />
+            <element signature="e#22297#24918#0" expanded="false" />
+            <element signature="e#25007#25165#0" expanded="false" />
+            <element signature="e#25017#25051#0" expanded="false" />
+            <element signature="e#25228#36085#0" expanded="false" />
+            <element signature="e#25956#25957#0" expanded="false" />
+            <element signature="e#31106#32055#0" expanded="false" />
+            <element signature="e#32473#33253#0" expanded="false" />
+            <element signature="e#33656#34590#0" expanded="false" />
+            <element signature="e#34922#35592#0" expanded="false" />
+            <element signature="e#36147#46475#0" expanded="false" />
+            <element signature="e#42089#42574#0" expanded="false" />
+            <element signature="e#42925#43309#0" expanded="false" />
+            <element signature="e#43729#44569#0" expanded="false" />
+            <element signature="e#44870#45340#0" expanded="false" />
+            <element signature="e#45844#46123#0" expanded="false" />
+            <element signature="e#46540#49042#0" expanded="false" />
+            <element signature="e#49134#49222#0" expanded="false" />
+            <element signature="e#49285#58880#0" expanded="false" />
+            <element signature="e#50336#50339#0" expanded="false" />
+            <element signature="e#52923#53074#0" expanded="false" />
+            <element signature="e#54197#55395#0" expanded="false" />
+            <element signature="e#56492#56796#0" expanded="false" />
+            <element signature="e#57144#57876#0" expanded="false" />
+            <element signature="e#58153#58550#0" expanded="false" />
+            <element signature="e#58943#65764#0" expanded="false" />
+            <element signature="e#60084#60087#0" expanded="false" />
+            <element signature="e#65829#67622#0" expanded="false" />
+            <element signature="e#65944#65947#0" expanded="false" />
+            <marker date="1576586745670" expanded="true" signature="4467:4511" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1576586745670" expanded="true" signature="4467:4527" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1576586745670" expanded="true" signature="4829:4891" ph="SELECT ISNUL... PRDT" />
+            <marker date="1576586745670" expanded="true" signature="5756:5986" ph="INSERT INTO MF_PSS... " />
+            <marker date="1576586745670" expanded="true" signature="6964:7017" ph="INSERT INTO MF_PSS_Z... " />
+            <marker date="1576586745670" expanded="true" signature="6964:7151" ph="INSERT INTO MF_PSS_Z... " />
+            <marker date="1576586745670" expanded="true" signature="7154:7386" ph="INSERT INTO MF_ARP... " />
+            <marker date="1576586745670" expanded="true" signature="8313:8487" ph="INSERT INTO MF_PSS... " />
+            <marker date="1576586745670" expanded="true" signature="8313:8545" ph="INSERT INTO MF_PSS... " />
+            <marker date="1576586745670" expanded="true" signature="9487:9692" ph="INSERT INTO TF_PSS... " />
+            <marker date="1576586745670" expanded="true" signature="14710:14767" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1576586745670" expanded="true" signature="14938:15007" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1576586745670" expanded="true" signature="15276:15345" ph="SELECT ACC_F... MF_PSS" />
+            <marker date="1576586745670" expanded="true" signature="15747:15807" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1576586745670" expanded="true" signature="16109:16171" ph="SELECT ISNUL... " />
+            <marker date="1576586745670" expanded="true" signature="17081:17138" ph="UPDATE MF_PS... " />
+            <marker date="1576586745670" expanded="true" signature="17236:17293" ph="UPDATE MF_PS... " />
+            <marker date="1576586745670" expanded="true" signature="17428:17566" ph="UPDATE MF_PS... " />
+            <marker date="1576586745670" expanded="true" signature="18401:18519" ph="UPDATE MF_AR... " />
+            <marker date="1576586745670" expanded="true" signature="19144:19371" ph="INSERT INTO MF_ARP... " />
+            <marker date="1576586745670" expanded="true" signature="20388:20526" ph="UPDATE MF_PS... " />
+            <marker date="1576586745670" expanded="true" signature="21134:21184" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="21373:21484" ph="UPDATE TF_PS... " />
+            <marker date="1576586745670" expanded="true" signature="23150:23207" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1576586745670" expanded="true" signature="23427:23496" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1576586745670" expanded="true" signature="23811:23880" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1576586745670" expanded="true" signature="24280:24329" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="24389:24438" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="24498:24549" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="29498:29558" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1576586745670" expanded="true" signature="29860:29922" ph="SELECT ISNUL... " />
+            <marker date="1576586745670" expanded="true" signature="30813:31066" ph="INSERT INTO MF_PSS... " />
+            <marker date="1576586745670" expanded="true" signature="32197:32433" ph="INSERT INTO MF_ARP... " />
+            <marker date="1576586745670" expanded="true" signature="33361:33616" ph="INSERT INTO MF_PSS... " />
+            <marker date="1576586745670" expanded="true" signature="34677:34886" ph="INSERT INTO TF_PSS... " />
+            <marker date="1576586745670" expanded="true" signature="39329:39386" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1576586745670" expanded="true" signature="39647:39716" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1576586745670" expanded="true" signature="40031:40100" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1576586745670" expanded="true" signature="40552:40612" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1576586745670" expanded="true" signature="40914:40976" ph="SELECT ISNUL... " />
+            <marker date="1576586745670" expanded="true" signature="41921:42059" ph="UPDATE MF_PS... " />
+            <marker date="1576586745670" expanded="true" signature="42774:42892" ph="UPDATE MF_AR... " />
+            <marker date="1576586745670" expanded="true" signature="43454:43685" ph="INSERT INTO MF_ARP... " />
+            <marker date="1576586745670" expanded="true" signature="44702:44840" ph="UPDATE MF_PS... " />
+            <marker date="1576586745670" expanded="true" signature="45448:45498" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="45708:45819" ph="UPDATE TF_PS... " />
+            <marker date="1576586745670" expanded="true" signature="47274:47331" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1576586745670" expanded="true" signature="47551:47620" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1576586745670" expanded="true" signature="47935:48004" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1576586745670" expanded="true" signature="48404:48453" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="48513:48562" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="48622:48673" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="52985:53045" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1576586745670" expanded="true" signature="53361:53412" ph="SELECT ISNUL... BACC" />
+            <marker date="1576586745670" expanded="true" signature="53863:54153" ph="INSERT INTO TF_MON... " />
+            <marker date="1576586745670" expanded="true" signature="53863:54157" ph="INSERT INTO TF_MON... " />
+            <marker date="1576586745670" expanded="true" signature="55629:55909" ph="INSERT INTO TF_MON... " />
+            <marker date="1576586745670" expanded="true" signature="56321:56456" ph="INSERT INTO MF_MON... " />
+            <marker date="1576586745670" expanded="true" signature="56885:57108" ph="INSERT INTO MF_BAC... " />
+            <marker date="1576586745670" expanded="true" signature="57963:58117" ph="INSERT INTO TF_BAC... " />
+            <marker date="1576586745670" expanded="true" signature="62786:62846" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1576586745670" expanded="true" signature="63187:63238" ph="SELECT ISNUL... BACC" />
+            <marker date="1576586745670" expanded="true" signature="63714:63867" ph="UPDATE TF_MO... " />
+            <marker date="1576586745670" expanded="true" signature="64236:64390" ph="UPDATE TF_MO... " />
+            <marker date="1576586745670" expanded="true" signature="64655:64704" ph="UPDATE MF_MO... " />
+            <marker date="1576586745670" expanded="true" signature="64892:64979" ph="UPDATE MF_BA... " />
+            <marker date="1576586745670" expanded="true" signature="65256:65315" ph="UPDATE TF_BA... " />
+            <marker date="1576586745670" expanded="true" signature="66869:66916" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="66990:67038" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="67114:67147" ph="DELETE FROM " />
+            <marker date="1576586745670" expanded="true" signature="67235:67268" ph="DELETE FROM " />
           </folding>
         </state>
       </provider>

awj/awj/apps/erp/views.py

@@ -48,6 +48,8 @@ class PcOrder(View):
         AMT = req_data.get("AMT",0)  # 金额
         DEP = req_data.get("DEP",'')  # 部门代号
         SAL_NO = req_data.get("SAL_NO",'')  # 业务员代号
+        KPF = req_data.get("KPF", '')  # 开票否
+
         #
         # print(PS_DD)
         # print(CUS_NO)
@@ -174,6 +176,9 @@ class PcOrder(View):
                                     VOH_ID,
                                     DEP,
                                     SAL_NO])
+                    # 插入自定义栏位表
+                    if KPF=='T':
+                        cursor.execute("""INSERT INTO MF_PSS_Z(PS_ID,PS_NO,KPF)VALUES(%s,%s,%s)""",['PC','PC' + PS_NO[2::],'T'])
                     # 插入立账单MF_MRP------------------改CUR_ID   RMB
                     cursor.execute("""INSERT INTO MF_ARP(ARP_ID,OPN_ID,ARP_NO,BIL_NO,CUS_NO,PAY_DD,AMT,AMTN,AMTN_NET,EXC_RTO,CLOSE_ID,BIL_ID,SYS_DATE,BIL_DD,DEP,ZHANG_ID)VALUES
                                             (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)""",
@@ -241,10 +246,10 @@ class PcOrder(View):
                 return http.HttpResponseForbidden("新增进货单sql语句执行错误")
             transaction.savepoint_commit(sid)  # 提交事物
         # {
-        #     "PS_DD": "2019-12-02",
+        #     "PS_DD": "2019-12-09",
         #     "CUS_NO": "AQ1111",
         #     "CUS_NO_NAME": "天心客户",
-        #     "PS_NO": "PC9C020001",
+        #     "PS_NO": "PCA19C09001",
         #     "TAX_ID": "1",
         #     "ZHANG_ID": "1",
         #     "VOH_ID": "01",
@@ -280,7 +285,23 @@ class PcOrder(View):
         AMT = req_data.get("AMT",0)  # 金额
         DEP = req_data.get("DEP",'')  # 部门代号
         SAL_NO = req_data.get("SAL_NO",'')  # 业务员代号
-
+        KPF = req_data.get("KPF", '')  # 开票否
+        # {
+        #     "PS_DD": "2019-12-09",
+        #     "CUS_NO": "AQ1111",
+        #     "CUS_NO_NAME": "天心客户",
+        #     "PS_NO": "PCA19C09001",
+        #     "TAX_ID": "1",
+        #     "ZHANG_ID": "1",
+        #     "VOH_ID": "01",
+        #     "USR": "a00001",
+        #     "USR_NAME": "楠楠",
+        #     "AMT": "200",
+        #     "DEP": "0000",
+        #     "SAL_NO": "A00002",
+        #     "user": "123",
+        #     "password": "123"
+        # }
         # 2校验参数
         # 判断是否有输入单号
         if PS_DD is None:
@@ -375,6 +396,11 @@ class PcOrder(View):
             sid = transaction.savepoint()  # 开启事物
             try:
                 # 插入进货单表头-----------------------改CUR_ID  RMB
+                # 修改自定义栏位表
+                if KPF == 'T':
+                    cursor.execute("""UPDATE MF_PSS_Z SET KPF=%s WHERE  PS_ID='PC' AND PS_NO=%s""",['T','PC' + PS_NO[2::]])
+                if KPF == 'F':
+                    cursor.execute("""UPDATE MF_PSS_Z SET KPF=%s WHERE  PS_ID='PC' AND PS_NO=%s""",['F','PC' + PS_NO[2::]])
                 if int(ZHANG_ID) == 1:
                     print(1)
                     cursor.execute("""UPDATE MF_PSS SET PS_DD=%s,CUS_NO=%s,ZHANG_ID=%s,TAX_ID=%s,VOH_ID=%s,DEP=%s,SAL_NO=%s,MODIFY_DD=%s,ARP_NO=%s WHERE PS_ID='PC' AND PS_NO=%s """,
@@ -405,6 +431,7 @@ class PcOrder(View):
                                     ZHANG_ID,
                                     'AP' + PS_NO[2::]
                                     ])
+
                     #如果旧是立账方式四不为1，然后改为1那么系统会在生成一张立账单
                     if int(ZHANG_ID_OLD) != 1:
                         cursor.execute("""INSERT INTO MF_ARP(ARP_ID,OPN_ID,ARP_NO,BIL_NO,CUS_NO,PAY_DD,AMT,AMTN,AMTN_NET,EXC_RTO,CLOSE_ID,BIL_ID,SYS_DATE,BIL_DD,DEP,ZHANG_ID)VALUES
@@ -475,12 +502,17 @@ class PcOrder(View):
         # 1获取参数
         req_data = json.loads(request.body.decode())
         PS_NO = req_data.get("PS_NO")  # 单据日期
+        # {
+        #     "PS_NO": "PCA19C09001",
+        #     "user": "123",
+        #     "password": "123"
+        # }
         # 判断是否有输入单号
         if PS_NO is None:
             return http.HttpResponseForbidden('请输入进货单号')
-        if PS_NO[:3] != 'PCA' or len(PS_NO) > 20:
+        if PS_NO[:3] != 'PCA' or len(PS_NO) != 11:
             # 判断单号是否合法
-            return http.HttpResponseForbidden('进货单号输入不合法，单号必须是PCA开头且长度不允许超过20位')
+            return http.HttpResponseForbidden('进货单号输入不合法，单号必须是PCA开头且长度必须为11位')
         # 判断进货单是否存在
         row_PS_NO = examine_ood('MF_PSS', 'PS_NO', PS_NO, 'PS_ID', 'PC')
         if row_PS_NO <= 0:
@@ -566,11 +598,11 @@ class SaOrder(View):
         # 2校验参数
         # 校验日期格式
         # {
-        #     "PS_DD": "2019-12-05",
+        #     "PS_DD": "2019-12-09",
         #     "CUS_NO": "AQ2222",
         #     "CUS_NO_NAME": "收款",
-        #     "PS_NO": "SAB9C0201",
-        #     "TAX_ID": "2",
+        #     "PS_NO": "SAB19C09001",
+        #     "TAX_ID": "1",
         #     "ZHANG_ID": "1",
         #     "VOH_ID": "01",
         #     "USR": "a00002",
@@ -581,6 +613,8 @@ class SaOrder(View):
         #     "user": "123",
         #     "password": "123"
         # }
+        if PS_DD is None:
+            return http.HttpResponseForbidden('请输入日期')
         try:
             datetime.datetime.strptime(PS_DD, '%Y-%m-%d')
         except Exception:
@@ -588,9 +622,9 @@ class SaOrder(View):
         # 判断是否有输入单号
         if PS_NO is None:
             return http.HttpResponseForbidden('请输入销货单号')
-        if PS_NO[:3] != 'SAB' or len(PS_NO) > 20:
+        if PS_NO[:3] != 'SAB' or len(PS_NO) != 11:
             # 判断单号是否合法
-            return http.HttpResponseForbidden('销货单号输入不合法，单号必须是SAB开头且长度不允许超过20位')
+            return http.HttpResponseForbidden('销货单号输入不合法，单号必须是SAB开头且长度必须为11位')
         # 判断金额是否输入正确
         if re.compile('(^-?[0-9](\d+)?(\.\d{1,6})?$)|(^0$)|(^\d\.\d{1,2}$)').match(str(AMT)) is None:
             return http.HttpResponseForbidden('金额输入不正确')
@@ -601,7 +635,7 @@ class SaOrder(View):
             return http.HttpResponseForbidden('请输入扣税类别')
         # 判断扣税类别是否输入正确
         if int(TAX_ID) != 1 and int(TAX_ID) != 2 and int(TAX_ID) != 3:
-            return http.HttpResponseForbidden('立账方式只能是1（不计税）,2（应该税内行），3（应税外加）')
+            return http.HttpResponseForbidden('扣税类别只能是1（不计税）,2（应该税内行），3（应税外加）')
         if ZHANG_ID is None:
             return http.HttpResponseForbidden('请输入立账方式')
         # 判断立账方式是否输入正确
@@ -789,8 +823,26 @@ class SaOrder(View):
         DEP = req_data.get("DEP", '')  # 部门代号
         SAL_NO = req_data.get("SAL_NO", '')  # 业务员代号
 
+        # {
+        #     "PS_DD": "2019-12-09",
+        #     "CUS_NO": "AQ2222",
+        #     "CUS_NO_NAME": "收款",
+        #     "PS_NO": "SAB19C09001",
+        #     "TAX_ID": "3",
+        #     "ZHANG_ID": "3",
+        #     "VOH_ID": "01",
+        #     "USR": "a00002",
+        #     "USR_NAME": "楠楠",
+        #     "AMT": "200",
+        #     "DEP": "0000",
+        #     "SAL_NO": "A00002",
+        #     "user": "123",
+        #     "password": "123"
+        # }
         # 2校验参数
         # 校验日期格式
+        if PS_DD is None:
+            return http.HttpResponseForbidden('请输入日期')
         try:
             datetime.datetime.strptime(PS_DD, '%Y-%m-%d')
         except Exception:
@@ -798,9 +850,9 @@ class SaOrder(View):
         # 判断是否有输入单号
         if PS_NO is None:
             return http.HttpResponseForbidden('请输入销货单号')
-        if PS_NO[:3] != 'SAB' or len(PS_NO) > 20:
+        if PS_NO[:3] != 'SAB' or len(PS_NO) != 11:
             # 判断单号是否合法
-            return http.HttpResponseForbidden('进货单号输入不合法，单号必须是SAB开头且长度不允许超过20位')
+            return http.HttpResponseForbidden('销货单号输入不合法，单号必须是SAB开头且长度必须为11位')
         # 判断金额是否输入正确
         if re.compile('(^-?[0-9](\d+)?(\.\d{1,6})?$)|(^0$)|(^\d\.\d{1,2}$)').match(str(AMT)) is None:
             return http.HttpResponseForbidden('金额输入不正确')
@@ -811,7 +863,7 @@ class SaOrder(View):
             return http.HttpResponseForbidden('请输入扣税类别')
         # 判断扣税类别是否输入正确
         if int(TAX_ID) != 1 and int(TAX_ID) != 2 and int(TAX_ID) != 3:
-            return http.HttpResponseForbidden('立账方式只能是1（不计税）,2（应该税内行），3（应税外加）')
+            return http.HttpResponseForbidden('扣税类别只能是1（不计税）,2（应该税内行），3（应税外加）')
         if ZHANG_ID is None:
             return http.HttpResponseForbidden('请输入立账方式')
         # 判断立账方式是否输入正确
@@ -988,10 +1040,10 @@ class SaOrder(View):
         PS_NO = req_data.get("PS_NO")  # 单据日期
         # 判断是否有输入单号
         if PS_NO is None:
-            return http.HttpResponseForbidden('请输入进货单号')
-        if PS_NO[:3] != 'SAB' or len(PS_NO) > 20:
+            return http.HttpResponseForbidden('请输入销货单号')
+        if PS_NO[:3] != 'SAB' or len(PS_NO) != 11:
             # 判断单号是否合法
-            return http.HttpResponseForbidden('销货单号输入不合法，单号必须是PCA开头且长度不允许超过20位')
+            return http.HttpResponseForbidden('销货单号输入不合法，单号必须是SAB开头且长度必须为11位')
             # 判断进货单是否存在
         row_PS_NO = examine_ood('MF_PSS', 'PS_NO', PS_NO, 'PS_ID', 'SA')
         if row_PS_NO <= 0:
@@ -1062,7 +1114,7 @@ class PtPayment(View):
         #     "RP_DD": "2019-12-06",
         #     "CUS_NO": "AQ2222",
         #     "CUS_NO_NAME": "收款",
-        #     "RP_NO": "SAB9C0201",
+        #     "RP_NO": "RTF9C0202",
         #     "AMTN_BC": "150",
         #     "CACC_NO": "01",
         #     "VOH_ID": "01",
@@ -1075,10 +1127,10 @@ class PtPayment(View):
         # }
 
         # 判断单号的合法性
-        print(RP_NO)
-        print(RP_NO[:3])
-        if RP_NO[:3] != 'RTF' or len(RP_NO) > 20:
-            return http.HttpResponseForbidden('预收款单号输入不合法，单号必须是RTF开头且长度不允许超过20位')
+        if RP_NO[:3] != 'RTF' or len(RP_NO) != 11:
+            return http.HttpResponseForbidden('预收款单号输入不合法，单号必须是RTF开头且长度长度必须为11位')
+        if RP_DD is None:
+            return http.HttpResponseForbidden('请输入日期')
         # 校验日期格式
         try:
             datetime.datetime.strptime(RP_DD, '%Y-%m-%d')
@@ -1086,6 +1138,8 @@ class PtPayment(View):
             return http.HttpResponseForbidden('日期格式输入不正确')
         if RP_NO is None:
             return http.HttpResponseForbidden('请输入预收款单号')
+        if CACC_NO is None:
+            return http.HttpResponseForbidden('请输入银行代号')
         # //判断有没有输入银行账号
         try:
             sum_CACC_NO = et_CACC_NO(CACC_NO)
@@ -1229,7 +1283,8 @@ class PtPayment(View):
                 return http.HttpResponseForbidden("预收款单新增sql语句执行异常")
             transaction.savepoint_commit(sid)
         context = {
-            'a': 'post新增预计收款作业'
+            "errmsg": '新增客户预付款单成功',
+            "code": 200
         }
         return http.JsonResponse(context)
 
@@ -1266,8 +1321,10 @@ class PtPayment(View):
         #     "user": "123",
         #     "password": "123"
         # }
-        if RP_NO[:3] != 'RTF' or len(RP_NO) >20:
-            return http.HttpResponseForbidden('预收款单号输入不合法，单号必须是RTF开头且长度不允许超过20位')
+        if RP_DD is None:
+            return http.HttpResponseForbidden('请输入时间')
+        if RP_NO[:3] != 'RTF' or len(RP_NO) !=11:
+            return http.HttpResponseForbidden('预收款单号输入不合法，单号必须是RTF开头且长度必须是11位')
         # 校验日期格式
         try:
             datetime.datetime.strptime(RP_DD, '%Y-%m-%d')
@@ -1275,6 +1332,8 @@ class PtPayment(View):
             return http.HttpResponseForbidden('日期格式输入不正确')
         if RP_NO is None:
             return http.HttpResponseForbidden('请输入预收款单号')
+        if CACC_NO is None:
+            return http.HttpResponseForbidden('请输入银行代号')
         # //判断有没有输入银行账号
         try:
             sum_CACC_NO = et_CACC_NO(CACC_NO)
@@ -1366,7 +1425,8 @@ class PtPayment(View):
                 return http.HttpResponseForbidden("预收款单修改sql语句执行异常")
             transaction.savepoint_commit(sid)
         context = {
-            'a': 'put修改预计收款作业'
+            "errmsg": '修改客户预付款单成功',
+            "code": 200
         }
         return http.JsonResponse(context)
 
@@ -1379,8 +1439,8 @@ class PtPayment(View):
         #     "RP_NO": "RTX9A300003"
         # }
         # 判断单号的合法性
-        if RP_NO[:3] != 'RTF' or len(RP_NO) > 20:
-            return http.HttpResponseForbidden('预收款单号输入不合法，单号必须是RTFS开头且长度不允许超过20位')
+        if RP_NO[:3] != 'RTF' or len(RP_NO) != 11:
+            return http.HttpResponseForbidden('预收款单号输入不合法，单号必须是RTF开头且长度必须为11位')
         if RP_NO is None:
             return http.HttpResponseForbidden('请输入预收款单号')
         # 判断单号是不是已经产生付款单
@@ -1410,6 +1470,7 @@ class PtPayment(View):
                 return http.HttpResponseForbidden("预收款单删除sql语句执行异常")
             transaction.savepoint_commit(sid)
         context = {
-            'a': 'delete删除预计收款作业'
+            "errmsg": '删除客户预付款单成功',
+            "code": 200
         }
         return http.JsonResponse(context)

awj/awj/utils/cust_data.py

@@ -14,7 +14,7 @@ def customer_data(CUS_NO,CUS_NO_NAME,OBJ_ID,DATE,RTO_TAX):
             cursor.execute("""
             INSERT INTO CUST(CUS_NO,[NAME],OBJ_ID,USR1,CHK_MAN,CLS_DATE,SYS_DATE,DEP,CLS_MTH,CLS_DD,MM_END,CHK_DD,CRD_ID,ID1_TAX
 ,CLS2,CUS_LEVEL,CHK_CRD,SO_CRD,CHK_FAX,CHK_CUS_IDX,CY_ID,CHK_INCLUDE,CHK_IRP,CHK_PAY1,PAY_FLAG,CHK_PAY2,CHK_PAY3,CHK_QK,CHK_IRP2,CHK_BARCODE,DATEFLAG_FQSK,
-CHK_KD,CHK_ZHANG_ID2,CHK_TYPE_MINXF,CHK_CK
-)VALUES (%s,%s,%s,%s,%s,%s,%s,'00000000',1,2,30,30,1,1,1,'F',1,'F','F',1,'F','F','F','F',1,'F','F','1','F',1,1,'F','T',1,'T')
+CHK_KD,CHK_ZHANG_ID2,CHK_TYPE_MINXF,CHK_CK,CNT_MAN2
+)VALUES (%s,%s,%s,%s,%s,%s,%s,'00000000',1,2,30,30,1,1,1,'F',1,'F','F',1,'F','F','F','F',1,'F','F','1','F',1,1,'F','T',1,'T','APP')
             """,[str(CUS_NO),str(CUS_NO_NAME),str(OBJ_ID),'ADMIN','ADMIN',str(DATE),str(DATE)])
     return "ok"

awj/logs/hwj.log

@@ -4632,3 +4632,85 @@ INFO 2019-12-06 17:44:02,905 autoreload 217 E:\12446\PycharmProjects\wangli\wanj
 INFO 2019-12-06 17:44:03,759 autoreload 597 Watching for file changes with StatReloader
 INFO 2019-12-06 17:46:29,378 autoreload 217 E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp\views.py changed, reloading.
 INFO 2019-12-06 17:46:30,045 autoreload 597 Watching for file changes with StatReloader
+INFO 2019-12-09 13:44:21,984 autoreload 597 Watching for file changes with StatReloader
+INFO 2019-12-09 13:44:31,453 basehttp 154 "POST /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 13:46:03,129 basehttp 154 "PUT /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 13:46:24,049 basehttp 154 "PUT /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 13:46:45,505 basehttp 154 "PUT /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 13:52:59,027 basehttp 154 "DELETE /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 13:53:25,223 basehttp 154 "POST /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 13:55:44,533 autoreload 217 E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp\views.py changed, reloading.
+INFO 2019-12-09 13:55:45,273 autoreload 597 Watching for file changes with StatReloader
+INFO 2019-12-09 13:56:09,115 autoreload 217 E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp\views.py changed, reloading.
+INFO 2019-12-09 13:56:09,811 autoreload 597 Watching for file changes with StatReloader
+WARNING 2019-12-09 13:57:39,493 log 228 Forbidden: /erpsaorder/
+WARNING 2019-12-09 13:57:39,493 basehttp 154 "POST /erpsaorder/ HTTP/1.1" 403 77
+WARNING 2019-12-09 13:57:52,346 log 228 Forbidden: /erpsaorder/
+WARNING 2019-12-09 13:57:52,347 basehttp 154 "POST /erpsaorder/ HTTP/1.1" 403 77
+WARNING 2019-12-09 13:58:13,108 log 228 Forbidden: /erpsaorder/
+WARNING 2019-12-09 13:58:13,109 basehttp 154 "POST /erpsaorder/ HTTP/1.1" 403 77
+INFO 2019-12-09 13:58:32,823 autoreload 597 Watching for file changes with StatReloader
+INFO 2019-12-09 13:58:35,874 basehttp 154 "POST /erpsaorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 13:59:25,591 autoreload 217 E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp\views.py changed, reloading.
+INFO 2019-12-09 13:59:26,325 autoreload 597 Watching for file changes with StatReloader
+WARNING 2019-12-09 14:00:35,494 log 228 Forbidden: /erpsaorder/
+WARNING 2019-12-09 14:00:35,495 basehttp 154 "PUT /erpsaorder/ HTTP/1.1" 403 77
+WARNING 2019-12-09 14:00:43,568 log 228 Forbidden: /erpsaorder/
+WARNING 2019-12-09 14:00:43,569 basehttp 154 "PUT /erpsaorder/ HTTP/1.1" 403 21
+INFO 2019-12-09 14:00:54,310 basehttp 154 "PUT /erpsaorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 14:01:16,116 basehttp 154 "PUT /erpsaorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 14:01:27,537 basehttp 154 "PUT /erpsaorder/ HTTP/1.1" 200 69
+INFO 2019-12-09 14:02:51,311 autoreload 217 E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp\views.py changed, reloading.
+INFO 2019-12-09 14:02:52,126 autoreload 597 Watching for file changes with StatReloader
+WARNING 2019-12-09 14:30:58,828 log 228 Forbidden: /erpptpayment/
+WARNING 2019-12-09 14:30:58,829 basehttp 154 "POST /erpptpayment/ HTTP/1.1" 403 86
+INFO 2019-12-09 14:31:03,385 basehttp 154 "POST /erpptpayment/ HTTP/1.1" 200 87
+INFO 2019-12-09 14:32:00,601 basehttp 154 "PUT /erpptpayment/ HTTP/1.1" 200 87
+ERROR 2019-12-09 14:33:48,636 log 228 Internal Server Error: /erpptpayment/
+Traceback (most recent call last):
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\core\handlers\exception.py", line 34, in inner
+    response = get_response(request)
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\core\handlers\base.py", line 115, in _get_response
+    response = self.process_exception_by_middleware(e, request)
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\core\handlers\base.py", line 113, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\views\generic\base.py", line 71, in view
+    return self.dispatch(request, *args, **kwargs)
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\views\generic\base.py", line 97, in dispatch
+    return handler(request, *args, **kwargs)
+  File "e:\12446\appdata\Lib\contextlib.py", line 52, in inner
+    return func(*args, **kwds)
+  File "E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp\views.py", line 1430, in delete
+    if RP_NO[:3] != 'RTF' or len(RP_NO) != 11:
+TypeError: 'NoneType' object is not subscriptable
+ERROR 2019-12-09 14:33:48,640 basehttp 154 "DELETE /erpptpayment/ HTTP/1.1" 500 82645
+ERROR 2019-12-09 14:35:00,550 log 228 Internal Server Error: /erpptpayment/
+Traceback (most recent call last):
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\core\handlers\exception.py", line 34, in inner
+    response = get_response(request)
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\core\handlers\base.py", line 115, in _get_response
+    response = self.process_exception_by_middleware(e, request)
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\core\handlers\base.py", line 113, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\views\generic\base.py", line 71, in view
+    return self.dispatch(request, *args, **kwargs)
+  File "C:\Users\12446\Envs\ceshi\lib\site-packages\django\views\generic\base.py", line 97, in dispatch
+    return handler(request, *args, **kwargs)
+  File "e:\12446\appdata\Lib\contextlib.py", line 52, in inner
+    return func(*args, **kwds)
+  File "E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp\views.py", line 1430, in delete
+    if RP_NO[:3] != 'RTF' or len(RP_NO) != 11:
+TypeError: 'NoneType' object is not subscriptable
+ERROR 2019-12-09 14:35:00,550 basehttp 154 "DELETE /erpptpayment/ HTTP/1.1" 500 82645
+INFO 2019-12-09 14:47:36,918 autoreload 217 E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp\views.py changed, reloading.
+INFO 2019-12-09 14:47:37,640 autoreload 597 Watching for file changes with StatReloader
+WARNING 2019-12-09 14:47:50,647 log 228 Forbidden: /erpptpayment/
+WARNING 2019-12-09 14:47:50,648 basehttp 154 "DELETE /erpptpayment/ HTTP/1.1" 403 80
+INFO 2019-12-09 14:48:11,080 basehttp 154 "DELETE /erpptpayment/ HTTP/1.1" 200 87
+INFO 2019-12-16 13:53:48,040 autoreload 597 Watching for file changes with StatReloader
+INFO 2019-12-16 13:54:52,897 basehttp 154 "POST /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-17 20:46:23,062 autoreload 597 Watching for file changes with StatReloader
+INFO 2019-12-17 20:48:05,321 basehttp 154 "POST /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-17 20:48:47,815 basehttp 154 "PUT /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-17 20:48:57,694 basehttp 154 "PUT /erppcorder/ HTTP/1.1" 200 69
+INFO 2019-12-17 20:49:31,572 basehttp 154 "POST /erppcorder/ HTTP/1.1" 200 69