Improve the UI and API for sales shipments

core/api/src/main/java/com/wansenai/api/ReceiptController.java → core/api/src/main/java/com/wansenai/api/receipt/ReceiptController.java

@@ -10,7 +10,7 @@
  * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package com.wansenai.api;
+package com.wansenai.api.receipt;
 
 import com.wansenai.service.receipt.ReceiptRetailService;
 import com.wansenai.utils.response.Response;

core/api/src/main/java/com/wansenai/api/RetailController.java → core/api/src/main/java/com/wansenai/api/receipt/RetailController.java

@@ -10,7 +10,7 @@
  * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package com.wansenai.api;
+package com.wansenai.api.receipt;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wansenai.dto.receipt.retail.QueryRetailRefundDTO;

core/api/src/main/java/com/wansenai/api/SalesController.java → core/api/src/main/java/com/wansenai/api/receipt/SalesController.java

@@ -10,7 +10,7 @@
  * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
  * and limitations under the License.
  */
-package com.wansenai.api;
+package com.wansenai.api.receipt;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wansenai.dto.receipt.sale.QuerySaleOrderDTO;
@@ -65,26 +65,26 @@
 
     @GetMapping("/shipments/pageList")
     public Response<Page<SaleShipmentsVO>> shipmentsPageList(@ModelAttribute QuerySaleShipmentsDTO shipmentsDTO) {
         return receiptSaleService.getSaleShipmentsPage(shipmentsDTO);
     }
 
     @PostMapping("/shipments/addOrUpdate")
     public Response<String> addOrUpdateShipments(@RequestBody SaleShipmentsDTO shipmentsDTO) {
         return receiptSaleService.addOrUpdateSaleShipments(shipmentsDTO);
     }
 
     @GetMapping("/shipments/detail/{id}")
     public Response<SaleShipmentsDetailVO> shipmentsDetail(@PathVariable("id") Long id) {
         return receiptSaleService.getSaleShipmentsDetail(id);
     }
 
     @PutMapping("/shipments/updateStatus/{ids}/{status}")
     public Response<String> updateShipmentsStatus(@PathVariable("ids") List<Long> ids, @PathVariable("status") Integer status) {
         return receiptSaleService.updateSaleShipmentsStatus(ids, status);
     }
 
     @PutMapping("/shipments/delete/{ids}")
     public Response<String> deleteShipments(@PathVariable("ids") List<Long> ids) {
         return receiptSaleService.deleteSaleShipments(ids);
     }
 }

core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptRetailServiceImpl.java

@@ -234,7 +234,7 @@ public Response<String> addOrUpdateRetailShipments(RetailShipmentsDTO shipmentsD
             var fid = new ArrayList<>();
             if (!shipmentsDTO.getFiles().isEmpty()) {
                 var receiptMain = getById(shipmentsDTO.getId());
-                if (StringUtils.hasLength(receiptMain.getFileId())) {
+                if (receiptMain != null && StringUtils.hasLength(receiptMain.getFileId())) {
                     var ids = Arrays.stream(receiptMain.getFileId().split(","))
                             .map(Long::parseLong)
                             .collect(Collectors.toList());
@@ -660,7 +660,7 @@ public Response<String> addOrUpdateRetailRefund(RetailRefundDTO refundDTO) {
 
             if (!refundDTO.getFiles().isEmpty()) {
                 var receiptMain = getById(refundDTO.getId());
-                if (StringUtils.hasLength(receiptMain.getFileId())) {
+                if (receiptMain != null && StringUtils.hasLength(receiptMain.getFileId())) {
                     var ids = Arrays.stream(receiptMain.getFileId().split(","))
                             .map(Long::parseLong)
                             .collect(Collectors.toList());

core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptSaleServiceImpl.java

@@ -282,7 +282,7 @@ public Response<String> addOrUpdateSaleOrder(SaleOrderDTO saleOrderDTO) {
         var fid = new ArrayList<>();
         if (!saleOrderDTO.getFiles().isEmpty()) {
             var receiptMain = getById(saleOrderDTO.getId());
-            if (StringUtils.hasLength(receiptMain.getFileId())) {
+            if (receiptMain != null && StringUtils.hasLength(receiptMain.getFileId())) {
                 var ids = Arrays.stream(receiptMain.getFileId().split(","))
                         .map(Long::parseLong)
                         .collect(Collectors.toList());
@@ -677,7 +677,7 @@ public Response<String> addOrUpdateSaleShipments(SaleShipmentsDTO shipmentsDTO)
         var fid = new ArrayList<>();
         if (!shipmentsDTO.getFiles().isEmpty()) {
             var receiptMain = getById(shipmentsDTO.getId());
-            if (StringUtils.hasLength(receiptMain.getFileId())) {
+            if (receiptMain != null && StringUtils.hasLength(receiptMain.getFileId())) {
                 var ids = Arrays.stream(receiptMain.getFileId().split(","))
                         .map(Long::parseLong)
                         .collect(Collectors.toList());
@@ -758,8 +758,8 @@ public Response<String> addOrUpdateSaleShipments(SaleShipmentsDTO shipmentsDTO)
 
             var receiptSaleShipmentMain = ReceiptSaleMain.builder()
                     .id(id)
-                    .type(ReceiptConstants.RECEIPT_TYPE_ORDER)
-                    .subType(ReceiptConstants.RECEIPT_SUB_TYPE_SALES_ORDER)
+                    .type(ReceiptConstants.RECEIPT_TYPE_SHIPMENT)
+                    .subType(ReceiptConstants.RECEIPT_SUB_TYPE_SALES_SHIPMENTS)
                     .initReceiptNumber(shipmentsDTO.getReceiptNumber())
                     .receiptNumber(shipmentsDTO.getReceiptNumber())
                     .receiptDate(TimeUtil.parse(shipmentsDTO.getReceiptDate()))

web/src/views/sales/model/addEditModel.ts

@@ -18,24 +18,40 @@ export interface RowVO {
     taxTotalPrice: number,
     remark: string,
 }
-
-interface FormState {
+interface SaleOrderFormState {
     id: number | string | undefined;
     customerId: string;
     receiptNumber: string;
-    otherReceipt: string;
     discountRate: number;
     discountAmount: number;
     discountLastAmount: number | string;
     deposit: number;
+    remark: string;
+    operatorIds: number[] | undefined;
+    receiptDate: string | undefined | Dayjs;
+    warehouseId: number | string;
+    accountId: string | undefined;
+    multipleAccountIds: number[] | undefined;
+    multipleAccountAmounts: number[] | undefined;
+}
+
+interface SaleShipmentsFormState {
+    id: number | string | undefined;
+    customerId: string;
+    accountId: number | string | undefined;
+    receiptNumber: string;
+    receiptDate: string | undefined | Dayjs;
+    otherReceipt: string;
+    collectOfferRate: number;
+    collectOfferAmount: number;
+    collectOfferLastAmount: number | string;
     otherAmount: number;
     thisCollectAmount: number;
     thisArrearsAmount: number;
     remark: string;
+    status: number | undefined;
     operatorIds: number[] | undefined;
-    receiptDate: string | undefined | Dayjs;
     warehouseId: number | string;
-    accountId: string | undefined;
     multipleAccountIds: number[] | undefined;
     multipleAccountAmounts: number[] | undefined;
 }
@@ -220,19 +236,37 @@ const sumNum = (list: RowVO[], field: string) => {
 }
 
 const getTaxTotalPrice = ref('');
-const formState = reactive<FormState>({
+
+const formState = reactive<SaleOrderFormState>({
     id: undefined,
     customerId: '',
     receiptNumber: '',
-    otherReceipt: '',
     remark: '',
     discountRate: 0,
     discountAmount: 0,
     discountLastAmount: 0,
     deposit: 0,
+    accountId: undefined,
+    operatorIds: undefined,
+    receiptDate: '',
+    warehouseId: '',
+    multipleAccountIds: undefined,
+    multipleAccountAmounts: undefined,
+});
+
+const saleShipmentsFormState = reactive<SaleShipmentsFormState>({
+    id: undefined,
+    customerId: '',
+    receiptNumber: '',
+    otherReceipt: '',
+    remark: '',
+    collectOfferRate: 0,
+    collectOfferAmount: 0,
+    collectOfferLastAmount: 0,
     otherAmount: 0,
     thisCollectAmount: 0,
     thisArrearsAmount: 0,
+    status: undefined,
     accountId: undefined,
     operatorIds: undefined,
     receiptDate: '',
@@ -247,5 +281,6 @@ export {
     tableData,
     gridOptions,
     formState,
+    saleShipmentsFormState,
     getTaxTotalPrice,
 }